From d5e68a9497dc547b1bb80f30782d3e9424721c9b Mon Sep 17 00:00:00 2001 From: kaloz Date: Mon, 15 Jun 2009 07:13:00 +0000 Subject: [PATCH] rfkill config cleanup git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16471 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/other.mk | 2 +- target/linux/brcm47xx/config-2.6.28 | 2 -- target/linux/brcm47xx/config-2.6.30 | 2 -- target/linux/ifxmips/config-2.6.27 | 1 - target/linux/ixp4xx/config-2.6.27 | 1 - target/linux/ixp4xx/config-2.6.28 | 1 - target/linux/ixp4xx/config-default | 1 - target/linux/olpc/config-2.6.27 | 1 - target/linux/ppc40x/config-default | 1 - target/linux/s3c24xx/config-2.6.28 | 3 --- target/linux/s3c24xx/config-2.6.29 | 3 --- target/linux/s3c24xx/config-2.6.30 | 3 --- 12 files changed, 1 insertion(+), 20 deletions(-) diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk index 309e25b92..74905e123 100644 --- 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 8b6248ed6..fd7ffeedf 100644 --- 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 f027b2c60..967c586f9 100644 --- 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 aba12863f..b2fb156da 100644 --- 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 ee226e7c6..223b30ae7 100644 --- 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 4360a4c8d..980744661 100644 --- 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 9c48b880f..d1e165698 100644 --- 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 2800b7783..54994ac53 100644 --- 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 66b3e8928..51eeebd76 100644 --- 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 67da70dfa..3e3931255 100644 --- 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 3a7e32315..a6695e79a 100644 --- 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 5dcd0b66d..4bb2e88ce 100644 --- 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 -- 2.35.1