diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-05-05 16:14:16 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-05-05 16:14:16 -0400 |
| commit | 83163244f845c296a118ce85c653872dbff6abfe (patch) | |
| tree | ce2eac695a1c198f23d537e20ed86c16ece21f7e /drivers/net/wireless/p54/main.c | |
| parent | 0a12761bcd5646691c5d16dd93df84d1b8849285 (diff) | |
| parent | adfba3c7c026a6a5560d2a43fefc9b198cb74462 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
drivers/net/wireless/libertas_tf/cmd.c
drivers/net/wireless/libertas_tf/main.c
Diffstat (limited to 'drivers/net/wireless/p54/main.c')
| -rw-r--r-- | drivers/net/wireless/p54/main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/p54/main.c b/drivers/net/wireless/p54/main.c index 7bbd9d3bba6..c072f41747c 100644 --- a/drivers/net/wireless/p54/main.c +++ b/drivers/net/wireless/p54/main.c | |||
| @@ -546,8 +546,7 @@ struct ieee80211_hw *p54_init_common(size_t priv_data_len) | |||
| 546 | IEEE80211_HW_SUPPORTS_PS | | 546 | IEEE80211_HW_SUPPORTS_PS | |
| 547 | IEEE80211_HW_PS_NULLFUNC_STACK | | 547 | IEEE80211_HW_PS_NULLFUNC_STACK | |
| 548 | IEEE80211_HW_BEACON_FILTER | | 548 | IEEE80211_HW_BEACON_FILTER | |
| 549 | IEEE80211_HW_REPORTS_TX_ACK_STATUS | | 549 | IEEE80211_HW_REPORTS_TX_ACK_STATUS; |
| 550 | IEEE80211_HW_NOISE_DBM; | ||
| 551 | 550 | ||
| 552 | dev->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) | | 551 | dev->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) | |
| 553 | BIT(NL80211_IFTYPE_ADHOC) | | 552 | BIT(NL80211_IFTYPE_ADHOC) | |