rfkill config cleanup

SVN-Revision: 16471

diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index 309e25b929eb0f644be507742e95f829ac22521a..74905e1234b8481a89e3fa88a56c52f5e6f50aa9 100644 (file)
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -761,7 +761,7 @@ $(eval $(call KernelPackage,textsearch))
 define KernelPackage/rfkill
   SUBMENU:=$(OTHER_MENU)
   TITLE:=RF switch subsystem support
-  DEPENDS:=@LINUX_2_6 @!LINUX_2_6_21 @!TARGET_rb532 @!TARGET_avr32 @!TARGET_brcm47xx @!TARGET_s3c24xx @!TARGET_ifxmips @!TARGET_atheros @!TARGET_adm5120 @!TARGET_ar7 @!TARGET_ppc40x @!TARGET_ixp4xx @!TARGET_rdc @!TARGET_uml
+  DEPENDS:=@TARGET_x86||TARGET_olpc||TARGET_s3c24xx||TARGET_brcm47xx
   KCONFIG:= \
     CONFIG_RFKILL \
     CONFIG_RFKILL_INPUT \

diff --git a/target/linux/brcm47xx/config-2.6.28 b/target/linux/brcm47xx/config-2.6.28
index 8b6248ed67406096a168a8a227ff7fddf9eea20d..fd7ffeedf608a07a8cf4a270765c03395ea917e2 100644 (file)
--- a/target/linux/brcm47xx/config-2.6.28
+++ b/target/linux/brcm47xx/config-2.6.28
@@ -121,8 +121,6 @@ CONFIG_PHYLIB=y
 # CONFIG_PROC_KCORE is not set
 # CONFIG_PROM_EMU is not set
 # CONFIG_R6040 is not set
-CONFIG_RFKILL=y
-CONFIG_RFKILL_LEDS=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 # CONFIG_SCSI_DMA is not set
 # CONFIG_SERIAL_8250_DETECT_IRQ is not set

diff --git a/target/linux/brcm47xx/config-2.6.30 b/target/linux/brcm47xx/config-2.6.30
index f027b2c60763820d4e495c680e958859eeb99dd7..967c586f93b4f477707837ed13a78156ba3c9d03 100644 (file)
--- a/target/linux/brcm47xx/config-2.6.30
+++ b/target/linux/brcm47xx/config-2.6.30
@@ -130,8 +130,6 @@ CONFIG_PHYLIB=y
 # CONFIG_PROBE_INITRD_HEADER is not set
 # CONFIG_PROC_KCORE is not set
 # CONFIG_PROM_EMU is not set
-CONFIG_RFKILL=y
-CONFIG_RFKILL_LEDS=y
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 # CONFIG_SCSI_DMA is not set
 # CONFIG_SERIAL_8250_DETECT_IRQ is not set

diff --git a/target/linux/ifxmips/config-2.6.27 b/target/linux/ifxmips/config-2.6.27
index aba12863fc49adb33016becd3e4a7080c2e9cdba..b2fb156da96604c7586403ca9db4bc6c043b1d38 100644 (file)
--- a/target/linux/ifxmips/config-2.6.27
+++ b/target/linux/ifxmips/config-2.6.27
@@ -131,7 +131,6 @@ CONFIG_PCI_DOMAINS=y
 # CONFIG_PROBE_INITRD_HEADER is not set
 # CONFIG_PROM_EMU is not set
 # CONFIG_R6040 is not set
-CONFIG_RFKILL_LEDS=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 # CONFIG_SCSI_WAIT_SCAN is not set
 # CONFIG_SERIAL_8250 is not set

diff --git a/target/linux/ixp4xx/config-2.6.27 b/target/linux/ixp4xx/config-2.6.27
index ee226e7c66f894bbb0627d036a717ddafd1a0d81..223b30ae7c615b9feaba0ecf9fbcace48ad2e3f8 100644 (file)
--- a/target/linux/ixp4xx/config-2.6.27
+++ b/target/linux/ixp4xx/config-2.6.27
@@ -175,7 +175,6 @@ CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PCI=y
 CONFIG_PCI_SYSCALL=y
 # CONFIG_R6040 is not set
-CONFIG_RFKILL_LEDS=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_DS1672=y
 CONFIG_RTC_DRV_ISL1208=y

diff --git a/target/linux/ixp4xx/config-2.6.28 b/target/linux/ixp4xx/config-2.6.28
index 4360a4c8de409e1f205f242f71ffee6cd4d1d9d1..98074466143b33b705e93f4f706a27af1e1d6ec1 100644 (file)
--- a/target/linux/ixp4xx/config-2.6.28
+++ b/target/linux/ixp4xx/config-2.6.28
@@ -178,7 +178,6 @@ CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PCI=y
 CONFIG_PCI_SYSCALL=y
 # CONFIG_R6040 is not set
-CONFIG_RFKILL_LEDS=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_DS1672=y
 CONFIG_RTC_DRV_ISL1208=y

diff --git a/target/linux/ixp4xx/config-default b/target/linux/ixp4xx/config-default
index 9c48b880f3cbecbf32032c771088dfb1ec021596..d1e165698679cc79f97692be80360fed50e6342b 100644 (file)
--- a/target/linux/ixp4xx/config-default
+++ b/target/linux/ixp4xx/config-default
@@ -208,7 +208,6 @@ CONFIG_PCI=y
 CONFIG_PCI_SYSCALL=y
 # CONFIG_PRISM54 is not set
 # CONFIG_R6040 is not set
-CONFIG_RFKILL_LEDS=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_DS1672=y
 CONFIG_RTC_DRV_ISL1208=y

diff --git a/target/linux/olpc/config-2.6.27 b/target/linux/olpc/config-2.6.27
index 2800b7783374ded54a07ca3dbc0af834165cbeb6..54994ac53e1b147f2ef5ed0b1a73dc1177ce2ac5 100644 (file)
--- a/target/linux/olpc/config-2.6.27
+++ b/target/linux/olpc/config-2.6.27
@@ -490,7 +490,6 @@ CONFIG_PROFILING=y
 # CONFIG_RCU_TORTURE_TEST is not set
 CONFIG_RELAY=y
 # CONFIG_RELOCATABLE is not set
-# CONFIG_RFKILL is not set
 CONFIG_RTC=y
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_RWSEM_GENERIC_SPINLOCK is not set

diff --git a/target/linux/ppc40x/config-default b/target/linux/ppc40x/config-default
index 66b3e8928914d18f34054f5a3841cb7af4050ff4..51eeebd762c639af084b899f74b79d9f23cfafca 100644 (file)
--- a/target/linux/ppc40x/config-default
+++ b/target/linux/ppc40x/config-default
@@ -155,7 +155,6 @@ CONFIG_PPC_UDBG_16550=y
 CONFIG_PROC_DEVICETREE=y
 # CONFIG_R6040 is not set
 CONFIG_RESOURCES_64BIT=y
-CONFIG_RFKILL_LEDS=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 # CONFIG_SCHED_HRTICK is not set
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y

diff --git a/target/linux/s3c24xx/config-2.6.28 b/target/linux/s3c24xx/config-2.6.28
index 67da70dfaf5b348e2dd7c9bdbd963cb1014b7fa1..3e3931255caefc5f853ffc3d3d2bcea29ff82eb3 100644 (file)
--- a/target/linux/s3c24xx/config-2.6.28
+++ b/target/linux/s3c24xx/config-2.6.28
@@ -360,9 +360,6 @@ CONFIG_PROC_PAGE_MONITOR=y
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_DEBUG=y
 CONFIG_REGULATOR_PCF50633=y
-CONFIG_RFKILL=y
-CONFIG_RFKILL_INPUT=y
-CONFIG_RFKILL_LEDS=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DEBUG=y
 # CONFIG_RTC_DRV_CMOS is not set

diff --git a/target/linux/s3c24xx/config-2.6.29 b/target/linux/s3c24xx/config-2.6.29
index 3a7e32315461215b214a8e78b0f35055587037de..a6695e79a8fce32a0735e252eaf1b830c44dcb4c 100644 (file)
--- a/target/linux/s3c24xx/config-2.6.29
+++ b/target/linux/s3c24xx/config-2.6.29
@@ -366,9 +366,6 @@ CONFIG_REGULATOR=y
 CONFIG_REGULATOR_DEBUG=y
 CONFIG_REGULATOR_PCF50606=y
 CONFIG_REGULATOR_PCF50633=y
-CONFIG_RFKILL=y
-CONFIG_RFKILL_INPUT=y
-CONFIG_RFKILL_LEDS=y
 CONFIG_RTC_CLASS=y
 # CONFIG_RTC_DRV_CMOS is not set
 CONFIG_RTC_DRV_PCF50606=y

diff --git a/target/linux/s3c24xx/config-2.6.30 b/target/linux/s3c24xx/config-2.6.30
index 5dcd0b66dbddaa4f7c8b09b644abaf3f85e123eb..4bb2e88cefc28768800c420fdc026716c0e2d479 100644 (file)
--- a/target/linux/s3c24xx/config-2.6.30
+++ b/target/linux/s3c24xx/config-2.6.30
@@ -307,9 +307,6 @@ CONFIG_RD_GZIP=y
 CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_DEBUG is not set
 CONFIG_REGULATOR_PCF50633=y
-CONFIG_RFKILL=y
-CONFIG_RFKILL_INPUT=y
-CONFIG_RFKILL_LEDS=y
 CONFIG_RTC_CLASS=y
 # CONFIG_RTC_DRV_CMOS is not set
 CONFIG_RTC_DRV_PCF50633=y