diff options
| author | David S. Miller <davem@davemloft.net> | 2010-05-31 09:10:35 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-31 09:10:35 +0200 |
| commit | 92b4522f72916ff2675060e29e4b24cf26ab59ce (patch) | |
| tree | 8424a1c550a98ce09f127425fde9b7b5f2f5027a /net/mac80211 | |
| parent | Linux 2.6.35-rc1 (diff) | |
| parent | net: fix sk_forward_alloc corruptions (diff) | |
| download | linux-92b4522f72916ff2675060e29e4b24cf26ab59ce.tar.xz linux-92b4522f72916ff2675060e29e4b24cf26ab59ce.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/chan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/chan.c b/net/mac80211/chan.c index 5d218c530a4e..32be11e4c4d9 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) { |