diff --git a/[refs] b/[refs] index 0cec70bb596a..3fe17fedef90 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c211c9698920d2b114bd8fbf913c8bdab3918461 +refs/heads/master: bc8d7da3f19191f86dcc8274cf1a3f2d6aeb0aaa diff --git a/trunk/drivers/net/bnx2.c b/trunk/drivers/net/bnx2.c index d1865cc97313..8e6d618b5305 100644 --- a/trunk/drivers/net/bnx2.c +++ b/trunk/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; }