diff options
| author | David S. Miller <davem@davemloft.net> | 2009-07-26 10:01:25 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-26 10:01:25 -0700 |
| commit | c8b201ff867e64b6233d069563081775269f4499 (patch) | |
| tree | 35d363e6cb565fd7285480dc877a2da79eafb9a7 /net/mac80211/cfg.c | |
| parent | 436b355b96042ab6564f43a7dabd5c61d9634ff7 (diff) | |
| parent | 249b405cf8145da8a74b70544ae1079d244bdb00 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/mac80211/cfg.c')
| -rw-r--r-- | net/mac80211/cfg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 36f8f245fa4..52928ad9057 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -1293,7 +1293,7 @@ static void ieee80211_rfkill_poll(struct wiphy *wiphy) } #ifdef CONFIG_NL80211_TESTMODE -int ieee80211_testmode_cmd(struct wiphy *wiphy, void *data, int len) +static int ieee80211_testmode_cmd(struct wiphy *wiphy, void *data, int len) { struct ieee80211_local *local = wiphy_priv(wiphy); |