iwlwifi: Allow building iwl3945 without iwl4965.

[deliverable/linux.git] / drivers / net / wireless / iwlwifi / Kconfig

diff --git a/drivers/net/wireless/iwlwifi/Kconfig b/drivers/net/wireless/iwlwifi/Kconfig
index 4bdb75ecb170024cebd4b8105fd8174b81ed25b5..9a25f550fd16461067b029b3c7a4fcf6e458ebb5 100644 (file)
--- a/drivers/net/wireless/iwlwifi/Kconfig
+++ b/drivers/net/wireless/iwlwifi/Kconfig
@@ -1,13 +1,21 @@
+config IWLWIFI
+       bool
+       default n
+
 config IWLCORE
        tristate "Intel Wireless Wifi Core"
        depends on PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL
+       select IWLWIFI
 
 config IWLWIFI_LEDS
-       bool "Enable LEDS features in iwlwifi driver"
-       depends on IWLCORE && MAC80211_LEDS && LEDS_CLASS
-       ---help---
-         This option enables LEDS for the iwlwifi drivers
+       bool
+       default n
 
+config IWLWIFI_RFKILL
+       boolean "IWLWIFI RF kill support"
+       depends on IWLCORE
+       select RFKILL
+       select RFKILL_INPUT
 
 config IWL4965
        tristate "Intel Wireless WiFi 4965AGN"
@@ -32,7 +40,7 @@ config IWL4965
          runs.
 
          If you want to compile the driver as a module ( = code which can be
-         inserted in and remvoed from the running kernel whenever you want),
+         inserted in and removed from the running kernel whenever you want),
          say M here and read <file:Documentation/kbuild/modules.txt>.  The
          module will be called iwl4965.ko.
 
@@ -46,7 +54,10 @@ config IWL4965_HT
 
 config IWL4965_LEDS
        bool "Enable LEDS features in iwl4965 driver"
-       depends on IWL4965 && IWLWIFI_LEDS
+       depends on IWL4965
+       select MAC80211_LEDS
+       select LEDS_CLASS
+       select IWLWIFI_LEDS
        ---help---
          This option enables LEDS for the iwlwifi drivers
 
@@ -100,6 +111,7 @@ config IWL3945
        tristate "Intel PRO/Wireless 3945ABG/BG Network Connection"
        depends on PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL
        select FW_LOADER
+       select IWLWIFI
        ---help---
          Select to build the driver supporting the:
 
@@ -118,7 +130,7 @@ config IWL3945
          runs.
 
          If you want to compile the driver as a module ( = code which can be
-         inserted in and remvoed from the running kernel whenever you want),
+         inserted in and removed from the running kernel whenever you want),
          say M here and read <file:Documentation/kbuild/modules.txt>.  The
          module will be called iwl3945.ko.
 
@@ -130,7 +142,9 @@ config IWL3945_SPECTRUM_MEASUREMENT
 
 config IWL3945_LEDS
        bool "Enable LEDS features in iwl3945 driver"
-       depends on IWL3945 && MAC80211_LEDS && LEDS_CLASS
+       depends on IWL3945
+       select MAC80211_LEDS
+       select LEDS_CLASS
        ---help---
          This option enables LEDS for the iwl3945 driver.