git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
[pandora-kernel.git]
/
drivers
/
net
/
bnx2.c
diff --git
a/drivers/net/bnx2.c
b/drivers/net/bnx2.c
index
d1865cc
..
8e6d618
100644
(file)
--- a/
drivers/net/bnx2.c
+++ b/
drivers/net/bnx2.c
@@
-8317,7
+8317,7
@@
static const struct net_device_ops bnx2_netdev_ops = {
#endif
};
-static
void inline
vlan_features_add(struct net_device *dev, u32 flags)
+static
inline void
vlan_features_add(struct net_device *dev, u32 flags)
{
dev->vlan_features |= flags;
}