Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c99f3e4 authored by Gertjan van Wingerde's avatar Gertjan van Wingerde Committed by John W. Linville
Browse files

rt2x00: Fix build errors due to modularized rfkill or leds and built-in rt2x00. 



Fix by disabling rt2x00 rfkill support when rt2x00 is built-in and rfkill has been modularized, and
a similar scheme for the relationship between leds_class and rt2x00..
Also, give a warning to the end-user when rfkill-/leds-support is disabled this way, so that the
end-user has at least some clues on what is going on.

Proper fixing required some general updates of the Kconfig-structure for the rt2x00 driver, whereby
internal configuration symbols had to be moved to after the user-visible configuration symbols.

Signed-off-by: default avatarGertjan van Wingerde <gwingerde@kpnplanet.nl>
Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 55ad175f

drivers/net/wireless/rt2x00/Kconfig

+34 −35
Original line number Diff line number Diff line 
config RT2X00

	tristate "Ralink driver support"

menuconfig RT2X00

	bool "Ralink driver support"

	depends on MAC80211 && WLAN_80211 && EXPERIMENTAL

	---help---

	  This will enable the experimental support for the Ralink drivers,
@@ -17,39 +17,6 @@ config RT2X00 


if RT2X00



config RT2X00_LIB

	tristate



config RT2X00_LIB_PCI

	tristate

	select RT2X00_LIB



config RT2X00_LIB_USB

	tristate

	select RT2X00_LIB



config RT2X00_LIB_FIRMWARE

	boolean

	depends on RT2X00_LIB

	select FW_LOADER



config RT2X00_LIB_CRYPTO

	boolean

	depends on RT2X00_LIB



config RT2X00_LIB_RFKILL

	boolean

	depends on RT2X00_LIB

	depends on RFKILL

	default y



config RT2X00_LIB_LEDS

	boolean

	depends on RT2X00_LIB

	depends on NEW_LEDS

	depends on LEDS_CLASS

	default y



config RT2400PCI

	tristate "Ralink rt2400 (PCI/PCMCIA) support"

	depends on PCI
@@ -109,6 +76,38 @@ config RT73USB 


	  When compiled as a module, this driver will be called "rt73usb.ko".



config RT2X00_LIB_PCI

	tristate

	select RT2X00_LIB



config RT2X00_LIB_USB

	tristate

	select RT2X00_LIB



config RT2X00_LIB

	tristate



config RT2X00_LIB_FIRMWARE

	boolean

	select FW_LOADER



config RT2X00_LIB_CRYPTO

	boolean



config RT2X00_LIB_RFKILL

	boolean

	default y if (RT2X00_LIB=y && RFKILL=y) || (RT2X00_LIB=m && RFKILL!=n)



comment "rt2x00 rfkill support disabled due to modularized RFKILL and built-in rt2x00"

	depends on RT2X00_LIB=y && RFKILL=m



config RT2X00_LIB_LEDS

	boolean

	default y if (RT2X00_LIB=y && LEDS_CLASS=y) || (RT2X00_LIB=m && LEDS_CLASS!=n)



comment "rt2x00 leds support disabled due to modularized LEDS_CLASS and built-in rt2x00"

	depends on RT2X00_LIB=y && LEDS_CLASS=m



config RT2X00_LIB_DEBUGFS

	bool "Ralink debugfs support"

	depends on RT2X00_LIB && MAC80211_DEBUGFS