From af68159fe3535f26d607a60af5614c6a4c2b29b6 Mon Sep 17 00:00:00 2001
From: Javier Martinez Canillas <martinez.javier@gmail.com>
Date: Sat, 26 Mar 2011 16:42:33 +0000
Subject: [PATCH] --- yaml --- r: 243249 b: refs/heads/master c:
 6303e6e8da770e62a4d38f7206fe046514276d14 h: refs/heads/master i:   243247:
 bbf7109cb7f5a241dea13b8ebcec1bca043a07f5 v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/net/tg3.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6e79a1f27eac..aae907443deb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 27fd9de8eb9bf48e4a09c8f02d13f56e9a074a1e
+refs/heads/master: 6303e6e8da770e62a4d38f7206fe046514276d14
diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c
index 513565503f90..73c942d85f07 100644
--- a/trunk/drivers/net/tg3.c
+++ b/trunk/drivers/net/tg3.c
@@ -13118,7 +13118,7 @@ static void __devinit tg3_read_fw_ver(struct tg3 *tp)
 
 static struct pci_dev * __devinit tg3_find_peer(struct tg3 *);
 
-static void inline vlan_features_add(struct net_device *dev, unsigned long flags)
+static inline void vlan_features_add(struct net_device *dev, unsigned long flags)
 {
 	dev->vlan_features |= flags;
 }