Merge tag 'mac80211-next-for-davem-2016-04-13' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

Johannes Berg says:

====================
To synchronize with Kalle, here's just a big change that affects
all drivers - removing the duplicated enum ieee80211_band and
replacing it by enum nl80211_band. On top of that, just a small
documentation update.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/net/wireless/ath/ath5k/debug.c b/drivers/net/wireless/ath/ath5k/debug.c
index 654a1e33f827..929d7ccc031c 100644
--- a/drivers/net/wireless/ath/ath5k/debug.c
+++ b/drivers/net/wireless/ath/ath5k/debug.c
@@ -1043,14 +1043,14 @@ ath5k_debug_dump_bands(struct ath5k_hw *ah)
 
         BUG_ON(!ah->sbands);
 
-        for (b = 0; b < IEEE80211_NUM_BANDS; b++) {
+        for (b = 0; b < NUM_NL80211_BANDS; b++) {
                 struct ieee80211_supported_band *band = &ah->sbands[b];
                 char bname[6];
                 switch (band->band) {
-                case IEEE80211_BAND_2GHZ:
+                case NL80211_BAND_2GHZ:
                         strcpy(bname, "2 GHz");
                         break;
-                case IEEE80211_BAND_5GHZ:
+                case NL80211_BAND_5GHZ:
                         strcpy(bname, "5 GHz");
                         break;
                 default: