From: Stefano Brivio <stefano.brivio@polimi.it>
Date: Wed, 7 Nov 2007 23:28:00 +0000 (+0100)
Subject: b43legacy: fix kconfig dependecies for rfkill and leds
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=59f1b154653d961d3ace72a4a5311c395cf7d779;p=deliverable%2Flinux.git

b43legacy: fix kconfig dependecies for rfkill and leds

Fix dependencies for built-in b43legacy.

The patch to b43 by Michael Buesch <mb@bu3sch.de> has been ported to
b43legacy.

Signed-off-by: Stefano Brivio <stefano.brivio@polimi.it>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/drivers/net/wireless/b43legacy/Kconfig b/drivers/net/wireless/b43legacy/Kconfig
index 9718529af660..6745579ba96d 100644
--- a/drivers/net/wireless/b43legacy/Kconfig
+++ b/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