diff options
| author | David S. Miller <davem@davemloft.net> | 2009-06-07 07:24:21 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-07 07:24:21 -0400 |
| commit | b1bc81a0ef86b86fa410dd303d84c8c7bd09a64d (patch) | |
| tree | a0d2e6dd179e5d057776edd0ed865bc744dfa54d /drivers/net/wireless/iwlwifi/Kconfig | |
| parent | a93958ac980f0ce594ad90657ecbc595ff157a40 (diff) | |
| parent | 0c0c9e7076b69f93678e4ec711e2bf237398e623 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/iwlwifi/Kconfig')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/Kconfig | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/Kconfig b/drivers/net/wireless/iwlwifi/Kconfig index 8304f6406a17..6fe259fcfb8f 100644 --- a/drivers/net/wireless/iwlwifi/Kconfig +++ b/drivers/net/wireless/iwlwifi/Kconfig | |||
| @@ -5,15 +5,14 @@ config IWLWIFI | |||
| 5 | select FW_LOADER | 5 | select FW_LOADER |
| 6 | select MAC80211_LEDS if IWLWIFI_LEDS | 6 | select MAC80211_LEDS if IWLWIFI_LEDS |
| 7 | select LEDS_CLASS if IWLWIFI_LEDS | 7 | select LEDS_CLASS if IWLWIFI_LEDS |
| 8 | select RFKILL if IWLWIFI_RFKILL | ||
| 9 | 8 | ||
| 10 | config IWLWIFI_LEDS | 9 | config IWLWIFI_LEDS |
| 11 | bool "Enable LED support in iwlagn and iwl3945 drivers" | 10 | bool "Enable LED support in iwlagn and iwl3945 drivers" |
| 12 | depends on IWLWIFI | 11 | depends on IWLWIFI |
| 13 | 12 | ||
| 14 | config IWLWIFI_RFKILL | 13 | config IWLWIFI_RFKILL |
| 15 | bool "Enable RF kill support in iwlagn and iwl3945 drivers" | 14 | def_bool y |
| 16 | depends on IWLWIFI | 15 | depends on IWLWIFI && RFKILL |
| 17 | 16 | ||
| 18 | config IWLWIFI_SPECTRUM_MEASUREMENT | 17 | config IWLWIFI_SPECTRUM_MEASUREMENT |
| 19 | bool "Enable Spectrum Measurement in iwlagn driver" | 18 | bool "Enable Spectrum Measurement in iwlagn driver" |