move a few config symbols to the 2.6.23 template

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9288 3c298f89-4303-0410-b956-a3cf2f4a3e73

2 files changed, 19 insertions, 20 deletions

diff --git a/target/linux/generic-2.6/config-2.6.23 b/target/linux/generic-2.6/config-2.6.23
index 5d678e87ed..30967b9964 100644
--- a/target/linux/generic-2.6/config-2.6.23
+++ b/target/linux/generic-2.6/config-2.6.23
@@ -358,7 +358,7 @@ CONFIG_HFS_FS=m
 CONFIG_HIGH_RES_TIMERS=y
 # CONFIG_HIPPI is not set
 CONFIG_HOSTAP=m
-CONFIG_HOSTAP_CS=m
+# CONFIG_HOSTAP_CS is not set
 CONFIG_HOSTAP_FIRMWARE=y
 CONFIG_HOSTAP_FIRMWARE_NVRAM=y
 CONFIG_HOSTAP_PCI=m
@@ -651,6 +651,7 @@ CONFIG_JFFS2_ZLIB=y
 # CONFIG_JFS_STATISTICS is not set
 CONFIG_JOLIET=y
 # CONFIG_KALLSYMS is not set
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_KEXEC is not set
 # CONFIG_KEYS is not set
@@ -706,12 +707,17 @@ CONFIG_MODULES=y
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODVERSIONS is not set
+# CONFIG_MOUSE_APPLETOUCH is not set
+# CONFIG_MOUSE_INPORT is not set
+# CONFIG_MOUSE_LOGIBM is not set
+# CONFIG_MOUSE_PC110PAD is not set
 CONFIG_MSDOS_FS=m
 CONFIG_MSDOS_PARTITION=y
 # CONFIG_MTD_NAND is not set
 CONFIG_MTD_ROOTFS_ROOT_DEV=y
 CONFIG_MTD_ROOTFS_SPLIT=y
 # CONFIG_MTD_UBI is not set
+# CONFIG_MWAVE is not set
 # CONFIG_MYRI10GE is not set
 # CONFIG_NCP_FS is not set
 CONFIG_NET=y
@@ -800,6 +806,7 @@ CONFIG_NET_ETHERNET=y
 CONFIG_NET_IPGRE=m
 CONFIG_NET_IPGRE_BROADCAST=y
 CONFIG_NET_IPIP=m
+# CONFIG_NET_ISA is not set
 CONFIG_NET_KEY=m
 # CONFIG_NET_KEY_MIGRATE is not set
 CONFIG_NET_PCI=y
@@ -807,6 +814,7 @@ CONFIG_NET_PCI=y
 CONFIG_NET_PKTGEN=m
 # CONFIG_NET_POLL_CONTROLLER is not set
 CONFIG_NET_RADIO=y
+# CONFIG_NET_SB1000 is not set
 CONFIG_NET_SCHED=y
 CONFIG_NET_SCH_ATM=m
 CONFIG_NET_SCH_CBQ=m
@@ -1067,6 +1075,7 @@ CONFIG_RPCSEC_GSS_KRB5=m
 # CONFIG_RTC_CLASS is not set
 CONFIG_RTC_DRV_CMOS=y
 # CONFIG_RTC_DRV_MAX6900 is not set
+# CONFIG_RTL8187 is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_S2IO is not set
 # CONFIG_SATA_AHCI is not set
@@ -1151,6 +1160,7 @@ CONFIG_SCSI_PROC_FS=y
 # CONFIG_SECURITY is not set
 CONFIG_SELECT_MEMORY_MODEL=y
 # CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_ABITUGURU3 is not set
 # CONFIG_SENSORS_AD7418 is not set
 # CONFIG_SENSORS_ADM1021 is not set
 # CONFIG_SENSORS_ADM1025 is not set
@@ -1158,8 +1168,10 @@ CONFIG_SELECT_MEMORY_MODEL=y
 # CONFIG_SENSORS_ADM1029 is not set
 # CONFIG_SENSORS_ADM1031 is not set
 # CONFIG_SENSORS_ADM9240 is not set
+# CONFIG_SENSORS_APPLESMC is not set
 # CONFIG_SENSORS_ASB100 is not set
 # CONFIG_SENSORS_ATXP1 is not set
+# CONFIG_SENSORS_CORETEMP is not set
 # CONFIG_SENSORS_DME1737 is not set
 # CONFIG_SENSORS_DS1337 is not set
 # CONFIG_SENSORS_DS1374 is not set
@@ -1415,6 +1427,7 @@ CONFIG_TMPFS=y
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_TUN=m
 # CONFIG_TUNER_3036 is not set
+# CONFIG_TUNER_TEA5761 is not set
 CONFIG_UDF_FS=m
 CONFIG_UDF_NLS=y
 # CONFIG_UFS_FS is not set
@@ -1423,6 +1436,7 @@ CONFIG_UDF_NLS=y
 CONFIG_UNIX=y
 CONFIG_UNIX98_PTYS=y
 # CONFIG_UNIXWARE_DISKLABEL is not set
+# CONFIG_UNUSED_SYMBOLS is not set
 CONFIG_USB=m
 # CONFIG_USB_ACECAD is not set
 CONFIG_USB_ACM=m
@@ -1663,6 +1677,10 @@ CONFIG_VLAN_8021Q=y
 # CONFIG_VT is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_W1 is not set
+# 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_WAN is not set
 # CONFIG_WAN_ROUTER is not set
 CONFIG_WATCHDOG=y
diff --git a/target/linux/x86/config-2.6.23 b/target/linux/x86/config-2.6.23
index 88709c764e..f8cfbedf71 100644
--- a/target/linux/x86/config-2.6.23
+++ b/target/linux/x86/config-2.6.23
@@ -111,7 +111,6 @@ CONFIG_HID_SUPPORT=y
 # CONFIG_HIGHMEM4G is not set
 # CONFIG_HIGHMEM64G is not set
 # CONFIG_HIGH_RES_TIMERS is not set
-# CONFIG_HOSTAP_CS is not set
 # CONFIG_HPET_TIMER is not set
 CONFIG_HT_IRQ=y
 # CONFIG_HUGETLBFS is not set
@@ -159,7 +158,6 @@ CONFIG_ISAPNP=y
 CONFIG_ISA_DMA_API=y
 # CONFIG_ITCO_WDT is not set
 CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_EXTRA_PASS is not set
 CONFIG_KEXEC=y
 CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_LKKBD is not set
@@ -195,10 +193,6 @@ CONFIG_MICROCODE_OLD_INTERFACE=y
 # CONFIG_MK6 is not set
 # CONFIG_MK7 is not set
 # CONFIG_MK8 is not set
-# CONFIG_MOUSE_APPLETOUCH is not set
-# CONFIG_MOUSE_INPORT is not set
-# CONFIG_MOUSE_LOGIBM is not set
-# CONFIG_MOUSE_PC110PAD is not set
 CONFIG_MOUSE_PS2=y
 CONFIG_MOUSE_PS2_ALPS=y
 CONFIG_MOUSE_PS2_LIFEBOOK=y
@@ -251,7 +245,6 @@ CONFIG_MTD_PARTITIONS=y
 CONFIG_MTRR=y
 # 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
@@ -259,8 +252,6 @@ CONFIG_NATSEMI=m
 CONFIG_NE2K_PCI=m
 CONFIG_NETDEV_1000=y
 CONFIG_NET_ACT_POLICE=y
-# CONFIG_NET_ISA is not set
-# CONFIG_NET_SB1000 is not set
 CONFIG_NET_SCH_FIFO=y
 CONFIG_NET_VENDOR_3COM=y
 # CONFIG_NET_VENDOR_RACAL is not set
@@ -303,7 +294,6 @@ CONFIG_PREEMPT_BKL=y
 CONFIG_QUICKLIST=y
 # CONFIG_RELOCATABLE is not set
 CONFIG_RTC=y
-# CONFIG_RTL8187 is not set
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_SBC8360_WDT is not set
 # CONFIG_SBC_EPX_C3_WATCHDOG is not set
@@ -323,9 +313,6 @@ CONFIG_SCx200_I2C_SCL=12
 CONFIG_SCx200_I2C_SDA=13
 CONFIG_SCx200_WDT=m
 CONFIG_SEMAPHORE_SLEEPERS=y
-# CONFIG_SENSORS_ABITUGURU3 is not set
-# CONFIG_SENSORS_APPLESMC is not set
-# CONFIG_SENSORS_CORETEMP is not set
 CONFIG_SENSORS_PC87360=m
 # CONFIG_SERIAL_8250_CS is not set
 # CONFIG_SERIAL_8250_EXTENDED is not set
@@ -346,7 +333,6 @@ CONFIG_SND_AC97_CODEC=m
 CONFIG_SND_HDA_INTEL=m
 CONFIG_SND_INTEL8X0=m
 CONFIG_SOFT_WATCHDOG=m
-# CONFIG_SONYPI is not set
 CONFIG_SPARSEMEM_STATIC=y
 CONFIG_STOP_MACHINE=y
 CONFIG_SUSPEND_SMP_POSSIBLE=y
@@ -357,7 +343,6 @@ CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_TOSHIBA is not set
 # CONFIG_TYPHOON is not set
 CONFIG_UID16=y
-# CONFIG_UNUSED_SYMBOLS is not set
 # CONFIG_USBPCWATCHDOG is not set
 CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_EHCI_SPLIT_ISO=y
@@ -383,10 +368,6 @@ CONFIG_VORTEX=m
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 # CONFIG_VT_HW_CONSOLE_BINDING is not set
-# 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_WDT is not set
 CONFIG_X86=y