summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-05-28 22:36:41 -0700
committerDavid S. Miller <davem@davemloft.net>2010-05-28 22:36:41 -0700
commite5e5cf4c71508ed38e921b31b438b8b349409f2a (patch)
tree1e5f57fb8adaae40746031c2bec77c986cbbc52b /net
parent045de01a174d9f0734f657eb4b3313d89b4fd5ad (diff)
parentda1fdb02d9200ff28b6f3a380d21930335fe5429 (diff)
downloadlinux-3.10-e5e5cf4c71508ed38e921b31b438b8b349409f2a.tar.gz
linux-3.10-e5e5cf4c71508ed38e921b31b438b8b349409f2a.tar.bz2
linux-3.10-e5e5cf4c71508ed38e921b31b438b8b349409f2a.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/chan.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/chan.c b/net/mac80211/chan.c
index 5d218c530a4..32be11e4c4d 100644
--- a/net/mac80211/chan.c
+++ b/net/mac80211/chan.c
@@ -5,7 +5,7 @@
#include <linux/nl80211.h>
#include "ieee80211_i.h"
-enum ieee80211_chan_mode
+static enum ieee80211_chan_mode
__ieee80211_get_channel_mode(struct ieee80211_local *local,
struct ieee80211_sub_if_data *ignore)
{