From 58169529986e81e0d477ce11eb8b91f025f649c1 Mon Sep 17 00:00:00 2001 From: Ivo van Doorn Date: Mon, 8 Sep 2008 18:46:29 +0200 Subject: rt2x00: Make RFKILL enabled by default RFKILL should be enabled for _all_ hardware whether or not they feature a rfkill button or not. Remove driver specific RFKILL configuration options and make the rt2x00lib version depend on CONFIG_RFKILL and defaulting to 'y' to make sure it will always be enabled when RFKILL was enabled. This also fixes some bugs where RFKILL wasn't initialized and didn't respond to RFKILL key presses. Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville --- drivers/net/wireless/rt2x00/Kconfig | 30 ++---------------------------- 1 file changed, 2 insertions(+), 28 deletions(-) (limited to 'drivers/net/wireless/rt2x00/Kconfig') diff --git a/drivers/net/wireless/rt2x00/Kconfig b/drivers/net/wireless/rt2x00/Kconfig index 11f590d63af..c896c990387 100644 --- a/drivers/net/wireless/rt2x00/Kconfig +++ b/drivers/net/wireless/rt2x00/Kconfig @@ -40,7 +40,8 @@ config RT2X00_LIB_CRYPTO config RT2X00_LIB_RFKILL boolean depends on RT2X00_LIB - select RFKILL + depends on RFKILL + default y config RT2X00_LIB_LEDS boolean @@ -57,15 +58,6 @@ config RT2400PCI When compiled as a module, this driver will be called "rt2400pci.ko". -config RT2400PCI_RFKILL - bool "Ralink rt2400 rfkill support" - depends on RT2400PCI - select RT2X00_LIB_RFKILL - ---help--- - This adds support for integrated rt2400 hardware that features a - hardware button to control the radio state. - This feature depends on the RF switch subsystem rfkill. - config RT2400PCI_LEDS bool "Ralink rt2400 leds support" depends on RT2400PCI && NEW_LEDS @@ -85,15 +77,6 @@ config RT2500PCI When compiled as a module, this driver will be called "rt2500pci.ko". -config RT2500PCI_RFKILL - bool "Ralink rt2500 rfkill support" - depends on RT2500PCI - select RT2X00_LIB_RFKILL - ---help--- - This adds support for integrated rt2500 hardware that features a - hardware button to control the radio state. - This feature depends on the RF switch subsystem rfkill. - config RT2500PCI_LEDS bool "Ralink rt2500 leds support" depends on RT2500PCI && NEW_LEDS @@ -116,15 +99,6 @@ config RT61PCI When compiled as a module, this driver will be called "rt61pci.ko". -config RT61PCI_RFKILL - bool "Ralink rt2501/rt61 rfkill support" - depends on RT61PCI - select RT2X00_LIB_RFKILL - ---help--- - This adds support for integrated rt61 hardware that features a - hardware button to control the radio state. - This feature depends on the RF switch subsystem rfkill. - config RT61PCI_LEDS bool "Ralink rt2501/rt61 leds support" depends on RT61PCI && NEW_LEDS -- cgit v1.2.3