summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/iwlegacy
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-04-11 23:53:51 +0400
committerDavid S. Miller <davem@davemloft.net>2011-04-11 23:53:51 +0400
commit0e10b33a05fd57a8aaf9672e05e83937fb243a08 (patch)
treea8d8551e84a72b2f696b6d1f6112babb27d441ee /drivers/net/wireless/iwlegacy
parentb42282e5a05018ecdc0d63a4ad530b0999785912 (diff)
parent4a39e781682828c1b81a839e7d343fd91945a8d5 (diff)
downloadlinux-0e10b33a05fd57a8aaf9672e05e83937fb243a08.tar.xz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/iwlegacy')
-rw-r--r--drivers/net/wireless/iwlegacy/Kconfig9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlegacy/Kconfig b/drivers/net/wireless/iwlegacy/Kconfig
index 2a45dd44cc12..aef65cd47661 100644
--- a/drivers/net/wireless/iwlegacy/Kconfig
+++ b/drivers/net/wireless/iwlegacy/Kconfig
@@ -1,6 +1,5 @@
config IWLWIFI_LEGACY
- tristate "Intel Wireless Wifi legacy devices"
- depends on PCI && MAC80211
+ tristate
select FW_LOADER
select NEW_LEDS
select LEDS_CLASS
@@ -65,7 +64,8 @@ endmenu
config IWL4965
tristate "Intel Wireless WiFi 4965AGN (iwl4965)"
- depends on IWLWIFI_LEGACY
+ depends on PCI && MAC80211
+ select IWLWIFI_LEGACY
---help---
This option enables support for
@@ -92,7 +92,8 @@ config IWL4965
config IWL3945
tristate "Intel PRO/Wireless 3945ABG/BG Network Connection (iwl3945)"
- depends on IWLWIFI_LEGACY
+ depends on PCI && MAC80211
+ select IWLWIFI_LEGACY
---help---
Select to build the driver supporting the: