resync 2.6.31 patches

[openwrt.git] / target / linux / brcm47xx / config-2.6.28

diff --git a/target/linux/brcm47xx/config-2.6.28 b/target/linux/brcm47xx/config-2.6.28
index 8b6248e..3c0d165 100644 (file)
--- a/target/linux/brcm47xx/config-2.6.28
+++ b/target/linux/brcm47xx/config-2.6.28
@@ -119,10 +119,7 @@ CONFIG_PHYLIB=y
 # CONFIG_PNX8550_STB810 is not set
 # CONFIG_PROBE_INITRD_HEADER is not set
 # CONFIG_PROC_KCORE is not set
 # CONFIG_PNX8550_STB810 is not set
 # CONFIG_PROBE_INITRD_HEADER is not set
 # CONFIG_PROC_KCORE is not set

-# CONFIG_PROM_EMU is not set

 # CONFIG_R6040 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
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 # CONFIG_SCSI_DMA is not set
 # CONFIG_SERIAL_8250_DETECT_IRQ is not set