diff options
| author | David S. Miller <davem@davemloft.net> | 2010-05-29 01:36:41 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-29 01:36:41 -0400 |
| commit | e5e5cf4c71508ed38e921b31b438b8b349409f2a (patch) | |
| tree | 1e5f57fb8adaae40746031c2bec77c986cbbc52b /net | |
| parent | 045de01a174d9f0734f657eb4b3313d89b4fd5ad (diff) | |
| parent | da1fdb02d9200ff28b6f3a380d21930335fe5429 (diff) | |
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.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 @@ | |||
| 5 | #include <linux/nl80211.h> | 5 | #include <linux/nl80211.h> |
| 6 | #include "ieee80211_i.h" | 6 | #include "ieee80211_i.h" |
| 7 | 7 | ||
| 8 | enum ieee80211_chan_mode | 8 | static enum ieee80211_chan_mode |
| 9 | __ieee80211_get_channel_mode(struct ieee80211_local *local, | 9 | __ieee80211_get_channel_mode(struct ieee80211_local *local, |
| 10 | struct ieee80211_sub_if_data *ignore) | 10 | struct ieee80211_sub_if_data *ignore) |
| 11 | { | 11 | { |