---

yaml --- r: 243249 b: refs/heads/master c: 6303e6e h: refs/heads/master i: 243247: bbf7109 v: v3
git-mirror · Mar 28, 2011 · af68159 · af68159
1 parent 45826a3
commit af68159
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;
 }