3 files changed, 17 insertions, 8 deletions

diff --git a/drivers/net/wireless/iwlwifi/Kconfig b/drivers/net/wireless/iwlwifi/Kconfig
index f844b738d34e..c4e631d14bfe 100644
--- a/drivers/net/wireless/iwlwifi/Kconfig
+++ b/drivers/net/wireless/iwlwifi/Kconfig
@@ -49,7 +49,9 @@ config IWL4965_HT
 
 config IWL4965_LEDS
         bool "Enable LEDS features in iwl4965 driver"
-        depends on IWL4965 && MAC80211_LEDS && LEDS_CLASS
+        depends on IWL4965
+        select MAC80211_LEDS
+        select LEDS_CLASS
         select IWLWIFI_LEDS
         ---help---
           This option enables LEDS for the iwlwifi drivers
@@ -134,7 +136,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.
 
diff --git a/drivers/net/wireless/iwlwifi/Makefile b/drivers/net/wireless/iwlwifi/Makefile
index 4f3e88b12e3a..ec6187b75c3b 100644
--- a/drivers/net/wireless/iwlwifi/Makefile
+++ b/drivers/net/wireless/iwlwifi/Makefile
@@ -1,4 +1,4 @@
-obj-$(CONFIG_IWLCORE)   := iwlcore.o
+obj-$(CONFIG_IWLCORE)   += iwlcore.o
 iwlcore-objs            := iwl-core.o iwl-eeprom.o iwl-hcmd.o
 iwlcore-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-debugfs.o
 iwlcore-$(CONFIG_IWLWIFI_LEDS) += iwl-led.o
diff --git a/drivers/net/wireless/rt2x00/Kconfig b/drivers/net/wireless/rt2x00/Kconfig
index a1e3938cba9b..ab1029e79884 100644
--- a/drivers/net/wireless/rt2x00/Kconfig
+++ b/drivers/net/wireless/rt2x00/Kconfig
@@ -60,7 +60,8 @@ config RT2400PCI_RFKILL
 
 config RT2400PCI_LEDS
         bool "RT2400 leds support"
-        depends on RT2400PCI && LEDS_CLASS
+        depends on RT2400PCI
+        select LEDS_CLASS
         select RT2X00_LIB_LEDS
         ---help---
           This adds support for led triggers provided my mac80211.
@@ -86,7 +87,8 @@ config RT2500PCI_RFKILL
 
 config RT2500PCI_LEDS
         bool "RT2500 leds support"
-        depends on RT2500PCI && LEDS_CLASS
+        depends on RT2500PCI
+        select LEDS_CLASS
         select RT2X00_LIB_LEDS
         ---help---
           This adds support for led triggers provided my mac80211.
@@ -114,7 +116,8 @@ config RT61PCI_RFKILL
 
 config RT61PCI_LEDS
         bool "RT61 leds support"
-        depends on RT61PCI && LEDS_CLASS
+        depends on RT61PCI
+        select LEDS_CLASS
         select RT2X00_LIB_LEDS
         ---help---
           This adds support for led triggers provided my mac80211.
@@ -130,7 +133,8 @@ config RT2500USB
 
 config RT2500USB_LEDS
         bool "RT2500 leds support"
-        depends on RT2500USB && LEDS_CLASS
+        depends on RT2500USB
+        select LEDS_CLASS
         select RT2X00_LIB_LEDS
         ---help---
           This adds support for led triggers provided my mac80211.
@@ -148,7 +152,8 @@ config RT73USB
 
 config RT73USB_LEDS
         bool "RT73 leds support"
-        depends on RT73USB && LEDS_CLASS
+        depends on RT73USB
+        select LEDS_CLASS
         select RT2X00_LIB_LEDS
         ---help---
           This adds support for led triggers provided my mac80211.