summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/Kconfig
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-06-27 23:45:25 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-06-27 23:45:25 -0400
commit30b4d6565e4d57c6d03600c7822411c7cac19638 (patch)
tree57244f2a9694de61b373631841fc493bbdf43022 /drivers/net/wireless/Kconfig
parentaa8f6dfd355021b4dd8b74b0588fd6fd8f21b79f (diff)
parentad3fee560bc508008b3b2cf6358105c4c7081921 (diff)
downloadtalos-obmc-linux-30b4d6565e4d57c6d03600c7822411c7cac19638.tar.gz
talos-obmc-linux-30b4d6565e4d57c6d03600c7822411c7cac19638.zip
Merge /spare/repo/netdev-2.6 branch 'ieee80211'
Diffstat (limited to 'drivers/net/wireless/Kconfig')
-rw-r--r--drivers/net/wireless/Kconfig3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index a4a7e8a41775..ff5b1b1de2fa 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -192,9 +192,8 @@ config IPW_DEBUG
config IPW2200
tristate "Intel PRO/Wireless 2200BG and 2915ABG Network Connection"
- depends on NET_RADIO && PCI
+ depends on IEEE80211 && PCI
select FW_LOADER
- select IEEE80211
---help---
A driver for the Intel PRO/Wireless 2200BG and 2915ABG Network
Connection adapters.
OpenPOWER on IntegriCloud