Merge branch 'master' into for-next

[pandora-kernel.git] / net / mac80211 / tx.c

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index b0beaa5..306533b 100644 (file)
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -173,7 +173,7 @@ static __le16 ieee80211_duration(struct ieee80211_tx_data *tx, int group_addr,
        return cpu_to_le16(dur);
 }
 
        return cpu_to_le16(dur);
 }
 

-static int inline is_ieee80211_device(struct ieee80211_local *local,
+static inline int is_ieee80211_device(struct ieee80211_local *local,

                                      struct net_device *dev)
 {
        return local == wdev_priv(dev->ieee80211_ptr);
                                      struct net_device *dev)
 {
        return local == wdev_priv(dev->ieee80211_ptr);