diff options
| author | David S. Miller <davem@davemloft.net> | 2009-09-02 23:18:09 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-02 23:18:09 +0200 |
| commit | 3f968de276a8e585deb182d4ba56013a479c80bc (patch) | |
| tree | bff8932bb5e64c22708aad48a6edbef3a707a774 /drivers/net/wireless/ipw2x00 | |
| parent | net: file_operations should be const (diff) | |
| parent | ath9k: Reconfigure beacon timers after the scan is completed. (diff) | |
| download | linux-3f968de276a8e585deb182d4ba56013a479c80bc.tar.xz linux-3f968de276a8e585deb182d4ba56013a479c80bc.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/ipw2x00')
| -rw-r--r-- | drivers/net/wireless/ipw2x00/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/ipw2x00/Kconfig b/drivers/net/wireless/ipw2x00/Kconfig index 85cc79995f6f..a8131384c6b9 100644 --- a/drivers/net/wireless/ipw2x00/Kconfig +++ b/drivers/net/wireless/ipw2x00/Kconfig @@ -4,7 +4,7 @@ config IPW2100 tristate "Intel PRO/Wireless 2100 Network Connection" - depends on PCI && WLAN_80211 + depends on PCI && WLAN_80211 && CFG80211 select WIRELESS_EXT select FW_LOADER select LIB80211 @@ -63,7 +63,7 @@ config IPW2100_DEBUG config IPW2200 tristate "Intel PRO/Wireless 2200BG and 2915ABG Network Connection" - depends on PCI && WLAN_80211 + depends on PCI && WLAN_80211 && CFG80211 select WIRELESS_EXT select FW_LOADER select LIB80211 @@ -150,7 +150,7 @@ config IPW2200_DEBUG config LIBIPW tristate - depends on PCI && WLAN_80211 + depends on PCI && WLAN_80211 && CFG80211 select WIRELESS_EXT select CRYPTO select CRYPTO_ARC4 |