Resync kernel config, do not enable the setup file

SVN-Revision: 9329

diff --git a/target/linux/rdc/config-2.6.23 b/target/linux/rdc/config-2.6.23
index 8f39251a0c1f0b4129fa96d905dd44043e96f58e..2c8e42eaa69071751d2505d626f2b015e10f5f05 100644 (file)
--- a/target/linux/rdc/config-2.6.23
+++ b/target/linux/rdc/config-2.6.23
@@ -190,18 +190,12 @@ CONFIG_MTD_RDC3210_SIZE=0x400000
 # CONFIG_MTRR is not set
 # CONFIG_MVIAC3_2 is not set
 # CONFIG_MVIAC7 is not set
-# CONFIG_MWAVE is not set
 # CONFIG_MWINCHIP2 is not set
 # CONFIG_MWINCHIP3D is not set
 # CONFIG_MWINCHIPC6 is not set
 # CONFIG_NATSEMI is not set
 # CONFIG_NE2K_PCI is not set
-# CONFIG_NETDEV_1000 is not set
-CONFIG_NET_ACT_POLICE=y
-CONFIG_NET_SCH_FIFO=y
 # CONFIG_NET_VENDOR_3COM is not set
-CONFIG_NF_CT_PROTO_GRE=m
-CONFIG_NF_NAT_PROTO_GRE=m
 CONFIG_NLS_ISO8859_2=m
 CONFIG_NOHIGHMEM=y
 # CONFIG_NO_HZ is not set
@@ -233,7 +227,6 @@ CONFIG_R6040=m
 # CONFIG_R6040_NAPI is not set
 # CONFIG_RELOCATABLE is not set
 # CONFIG_RTC is not set
-# CONFIG_RTL8187 is not set
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 # CONFIG_SBC8360_WDT is not set
 # CONFIG_SBC_EPX_C3_WATCHDOG is not set
@@ -257,9 +250,7 @@ CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_TELCLOCK is not set
 # CONFIG_TICK_ONESHOT is not set
 # CONFIG_TOSHIBA is not set
-# CONFIG_TUNER_TEA5761 is not set
 CONFIG_UID16=y
-# CONFIG_UNUSED_SYMBOLS is not set
 # CONFIG_USBPCWATCHDOG is not set
 CONFIG_USB_EHCI_HCD=m
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
@@ -285,10 +276,6 @@ CONFIG_VIRTUALIZATION=y
 CONFIG_VMSPLIT_3G=y
 # CONFIG_VMSPLIT_3G_OPT is not set
 CONFIG_VM_EVENT_COUNTERS=y
-# CONFIG_W83627HF_WDT is not set
-# CONFIG_W83697HF_WDT is not set
-# CONFIG_W83877F_WDT is not set
-# CONFIG_W83977F_WDT is not set
 # CONFIG_WAFER_WDT is not set
 CONFIG_X86=y
 CONFIG_X86_32=y

diff --git a/target/linux/rdc/files/arch/i386/mach-rdc/Makefile b/target/linux/rdc/files/arch/i386/mach-rdc/Makefile
index 07a92038d0f7b0700fc7d5b6139110766a2aacb6..5961bc791046cf4454f0727799f1f3b30fd8ae41 100644 (file)
--- a/target/linux/rdc/files/arch/i386/mach-rdc/Makefile
+++ b/target/linux/rdc/files/arch/i386/mach-rdc/Makefile
@@ -1,5 +1,5 @@
 #
 # Makefile for the RDC321x specific parts of the kernel
 #
-obj-$(CONFIG_X86_RDC)        := gpio.o platform.o wdt.o setup.o
+obj-$(CONFIG_X86_RDC)        := gpio.o platform.o wdt.o