diff --git a/[refs] b/[refs]
index 2a249966fb72..67293d12bb08 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d43d312a2adeb184c90b11449d5bb3a8f59a3a8
+refs/heads/master: 59f1b154653d961d3ace72a4a5311c395cf7d779
diff --git a/trunk/drivers/net/wireless/b43legacy/Kconfig b/trunk/drivers/net/wireless/b43legacy/Kconfig
index 9718529af660..6745579ba96d 100644
--- a/trunk/drivers/net/wireless/b43legacy/Kconfig
+++ b/trunk/drivers/net/wireless/b43legacy/Kconfig
@@ -35,15 +35,19 @@ config B43LEGACY_PCICORE_AUTOSELECT
 	default y
 
 # LED support
+# This config option automatically enables b43legacy LEDS support,
+# if it's possible.
 config B43LEGACY_LEDS
 	bool
-	depends on B43LEGACY && MAC80211_LEDS
+	depends on B43LEGACY && MAC80211_LEDS && (LEDS_CLASS = y || LEDS_CLASS = B43LEGACY)
 	default y
 
 # RFKILL support
+# This config option automatically enables b43legacy RFKILL support,
+# if it's possible.
 config B43LEGACY_RFKILL
 	bool
-	depends on B43LEGACY && RFKILL && RFKILL_INPUT && INPUT_POLLDEV
+	depends on B43LEGACY && (RFKILL = y || RFKILL = B43LEGACY) && RFKILL_INPUT && (INPUT_POLLDEV = y || INPUT_POLLDEV = B43LEGACY)
 	default y
 
 config B43LEGACY_DEBUG