diff options
| author |   David S. Miller <davem@davemloft.net> | 2016-04-13 17:58:51 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-13 17:58:51 -0400 |
| commit | 71bbe25d01fa4f35551ff7bffc3e03ddd3e960cd (patch) | |
| tree | d32c77e506192ef0ba62a10e92aac410eccaa575 /drivers/net/wireless/intersil/p54/p54.h | |
| parent | tipc: remove remnants of old broadcast code (diff) | |
| parent | cfg80211: remove enum ieee80211_band (diff) | |
| download | linux-dev-71bbe25d01fa4f35551ff7bffc3e03ddd3e960cd.tar.xz linux-dev-71bbe25d01fa4f35551ff7bffc3e03ddd3e960cd.zip | |
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>
Diffstat (limited to 'drivers/net/wireless/intersil/p54/p54.h')
| -rw-r--r-- | drivers/net/wireless/intersil/p54/p54.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/intersil/p54/p54.h b/drivers/net/wireless/intersil/p54/p54.h index 40b401ed6845..529939e611cd 100644 --- a/drivers/net/wireless/intersil/p54/p54.h +++ b/drivers/net/wireless/intersil/p54/p54.h @@ -223,7 +223,7 @@ struct p54_common { struct p54_cal_database *curve_data; struct p54_cal_database *output_limit; struct p54_cal_database *rssi_db; - struct ieee80211_supported_band *band_table[IEEE80211_NUM_BANDS]; + struct ieee80211_supported_band *band_table[NUM_NL80211_BANDS]; /* BBP/MAC state */ u8 mac_addr[ETH_ALEN]; |