[kernel] move some 2.6.27 config stuff to generic

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

3 files changed, 15 insertions, 26 deletions

diff --git a/target/linux/ar71xx/config-2.6.27 b/target/linux/ar71xx/config-2.6.27
index 2e994aeec..6591f6498 100644
--- a/target/linux/ar71xx/config-2.6.27
+++ b/target/linux/ar71xx/config-2.6.27
@@ -3,7 +3,6 @@ CONFIG_32BIT=y
 # CONFIG_8139TOO is not set
 CONFIG_ADM6996_PHY=y
 CONFIG_AG71XX=y
-# CONFIG_ALIM7101_WDT is not set
 # CONFIG_AR71XX_EARLY_SERIAL is not set
 CONFIG_AR71XX_MACH_GENERIC=y
 CONFIG_AR71XX_MACH_RB_4XX=y
@@ -17,12 +16,10 @@ CONFIG_ARCH_REQUIRE_GPIOLIB=y
 CONFIG_ARCH_SUPPORTS_OPROFILE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ATHEROS_AR71XX=y
-# CONFIG_ATL1E is not set
 CONFIG_BASE_SMALL=0
 # CONFIG_BCM47XX is not set
 CONFIG_BITREVERSE=y
 # CONFIG_BROADCOM_PHY is not set
-CONFIG_BT_HCIBTUSB=m
 CONFIG_CEVT_R4K=y
 CONFIG_CLASSIC_RCU=y
 CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,yaffs,jffs2 noinitrd console=ttyS0,115200 init=/etc/preinit"
@@ -55,12 +52,9 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y
 # CONFIG_CPU_TX39XX is not set
 # CONFIG_CPU_TX49XX is not set
 # CONFIG_CPU_VR41XX is not set
-# CONFIG_CRC_T10DIF is not set
 CONFIG_CSRC_R4K=y
-# CONFIG_DEBUG_MEMORY_INIT is not set
 CONFIG_DEVPORT=y
 # CONFIG_DM9000 is not set
-# CONFIG_DMADEVICES is not set
 CONFIG_DMA_NEED_PCI_MAP_STATE=y
 CONFIG_DMA_NONCOHERENT=y
 CONFIG_EARLY_PRINTK=y
@@ -93,7 +87,6 @@ CONFIG_HAVE_IDE=y
 # CONFIG_HAVE_KPROBES is not set
 # CONFIG_HAVE_KRETPROBES is not set
 CONFIG_HAVE_OPROFILE=y
-# CONFIG_HP_ILO is not set
 CONFIG_HW_HAS_PCI=y
 CONFIG_HW_RANDOM=m
 # CONFIG_I2C is not set
@@ -200,7 +193,6 @@ CONFIG_RFKILL_LEDS=y
 CONFIG_RTC_LIB=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-# CONFIG_SCSI_DH is not set
 CONFIG_SCSI_WAIT_SCAN=m
 # CONFIG_SERIAL_8250_EXTENDED is not set
 CONFIG_SERIAL_8250_NR_UARTS=1
@@ -220,10 +212,9 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=1
 # CONFIG_SLAB is not set
 CONFIG_SLUB=y
 # CONFIG_SMSC_PHY is not set
-# CONFIG_SND_DRIVERS is not set
 # CONFIG_SND_MIPS is not set
 # CONFIG_SND_SPI is not set
-# CONFIG_SND_USB is not set
+CONFIG_SND_USB=y
 # CONFIG_SOFT_WATCHDOG is not set
 # CONFIG_SPARSEMEM_STATIC is not set
 # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
@@ -234,7 +225,6 @@ CONFIG_SPI_BITBANG=y
 CONFIG_SPI_MASTER=y
 # CONFIG_SPI_SPIDEV is not set
 CONFIG_SSB_POSSIBLE=y
-CONFIG_STP=y
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_SYS_HAS_CPU_MIPS32_R1=y
 CONFIG_SYS_HAS_CPU_MIPS32_R2=y
@@ -256,14 +246,12 @@ CONFIG_USB_OHCI_AR71XX=y
 CONFIG_USB_OHCI_HCD=m
 CONFIG_USB_SUPPORT=y
 # CONFIG_USB_UHCI_HCD is not set
-# CONFIG_USE_GENERIC_SMP_HELPERS is not set
 # CONFIG_VGASTATE is not set
 # CONFIG_VIA_RHINE is not set
 CONFIG_VIDEO_MEDIA=m
 CONFIG_VIDEO_V4L2=m
 CONFIG_VIDEO_V4L2_COMMON=m
 # CONFIG_VLAN_8021Q_GVRP is not set
-CONFIG_XFRM_IPCOMP=m
 CONFIG_YAFFS_9BYTE_TAGS=y
 CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED=y
 CONFIG_YAFFS_AUTO_YAFFS2=y
diff --git a/target/linux/generic-2.6/config-2.6.27 b/target/linux/generic-2.6/config-2.6.27
index 51f149191..9b7249d0d 100644
--- a/target/linux/generic-2.6/config-2.6.27
+++ b/target/linux/generic-2.6/config-2.6.27
@@ -12,6 +12,7 @@
 # CONFIG_AF_RXRPC is not set
 CONFIG_AIRO=m
 CONFIG_AIRO_CS=m
+# CONFIG_ALIM7101_WDT is not set
 # CONFIG_AMD8111_ETH is not set
 # CONFIG_AMIGA_PARTITION is not set
 CONFIG_ANON_INODES=y
@@ -27,6 +28,7 @@ CONFIG_ASK_IP_FIB_HASH=y
 # CONFIG_ATA_OVER_ETH is not set
 # CONFIG_ATA_SFF is not set
 # CONFIG_ATL1 is not set
+# CONFIG_ATL1E is not set
 CONFIG_ATM=m
 CONFIG_ATMEL=m
 # CONFIG_ATM_AMBASSADOR is not set
@@ -180,6 +182,7 @@ CONFIG_BT_BNEP_PROTO_FILTER=y
 # CONFIG_BT_CMTP is not set
 CONFIG_BT_HCIBCM203X=m
 CONFIG_BT_HCIBFUSB=m
+# CONFIG_BT_HCIBTUSB is not set
 # CONFIG_BT_HCIBLUECARD is not set
 CONFIG_BT_HCIBPA10X=m
 # CONFIG_BT_HCIBT3C is not set
@@ -241,6 +244,7 @@ CONFIG_CRC32=y
 # CONFIG_CRC7 is not set
 CONFIG_CRC_CCITT=m
 CONFIG_CRC_ITU_T=m
+# CONFIG_CRC_T10DIF is not set
 CONFIG_CROSSCOMPILE=y
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_AEAD=m
@@ -303,6 +307,7 @@ CONFIG_CRYPTO_WP512=m
 # CONFIG_DAVICOM_PHY is not set
 # CONFIG_DEBUG_FS is not set
 # CONFIG_DEBUG_KERNEL is not set
+# CONFIG_DEBUG_MEMORY_INIT is not set
 # CONFIG_DECNET is not set
 # CONFIG_DEFAULT_AS is not set
 # CONFIG_DEFAULT_BIC is not set
@@ -323,6 +328,7 @@ CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 # CONFIG_DISPLAY_SUPPORT is not set
 # CONFIG_DL2K is not set
 # CONFIG_DLM is not set
+# CONFIG_DMADEVICES is not set
 # CONFIG_DMA_ENGINE is not set
 # CONFIG_DNOTIFY is not set
 # CONFIG_DRM is not set
@@ -426,6 +432,7 @@ CONFIG_HOTPLUG=y
 # CONFIG_HOTPLUG_PCI is not set
 # CONFIG_HP100 is not set
 # CONFIG_HPFS_FS is not set
+# CONFIG_HP_ILO is not set
 # CONFIG_HTC_PASIC3 is not set
 # CONFIG_HUGETLB_PAGE is not set
 # CONFIG_HWMON is not set
@@ -506,7 +513,7 @@ CONFIG_IFB=m
 # CONFIG_IMQ is not set
 # CONFIG_IMQ_BEHAVIOR_AA is not set
 # CONFIG_IMQ_BEHAVIOR_AB is not set
-CONFIG_IMQ_BEHAVIOR_BA=y
+# CONFIG_IMQ_BEHAVIOR_BA is not set
 # CONFIG_IMQ_BEHAVIOR_BB is not set
 CONFIG_IMQ_NUM_DEVS=2
 CONFIG_INET=y
@@ -1268,6 +1275,7 @@ CONFIG_SCSI=m
 # CONFIG_SCSI_DC390T is not set
 # CONFIG_SCSI_DC395x is not set
 # CONFIG_SCSI_DEBUG is not set
+# CONFIG_SCSI_DH is not set
 CONFIG_SCSI_DMA=y
 # CONFIG_SCSI_DMX3191D is not set
 # CONFIG_SCSI_DPT_I2O is not set
@@ -1411,6 +1419,7 @@ CONFIG_SIGNALFD=y
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
 CONFIG_SLAB=y
+CONFIG_SLAB_INFO=y
 CONFIG_SLHC=m
 # CONFIG_SLIP is not set
 # CONFIG_SLOB is not set
@@ -1452,6 +1461,7 @@ CONFIG_SND=m
 # CONFIG_SND_DARLA24 is not set
 # CONFIG_SND_DEBUG is not set
 # CONFIG_SND_DT019X is not set
+CONFIG_SND_DRIVERS=y
 # CONFIG_SND_DUMMY is not set
 # CONFIG_SND_DYNAMIC_MINORS is not set
 # CONFIG_SND_ECHO3G is not set
@@ -1560,6 +1570,7 @@ CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
 # CONFIG_SSFDC is not set
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_STANDALONE=y
+CONFIG_STP=y
 # CONFIG_STRIP is not set
 # CONFIG_SUNDANCE is not set
 # CONFIG_SUNGEM is not set
@@ -1818,6 +1829,7 @@ CONFIG_USB_YEALINK=m
 # CONFIG_USB_ZC0301 is not set
 # CONFIG_USB_ZD1201 is not set
 # CONFIG_USB_ZR364XX is not set
+# CONFIG_USE_GENERIC_SMP_HELPERS is not set
 # CONFIG_UTS_NS is not set
 # CONFIG_VETH is not set
 CONFIG_VFAT_FS=m
@@ -1923,6 +1935,7 @@ CONFIG_WLAN_80211=y
 # CONFIG_WR_PPMC is not set
 # CONFIG_X25 is not set
 CONFIG_XFRM=y
+CONFIG_XFRM_IPCOMP=m
 # CONFIG_XFRM_MIGRATE is not set
 # CONFIG_XFRM_STATISTICS is not set
 # CONFIG_XFRM_SUB_POLICY is not set
diff --git a/target/linux/ixp4xx/config-2.6.27 b/target/linux/ixp4xx/config-2.6.27
index b0241a85b..4649f91aa 100644
--- a/target/linux/ixp4xx/config-2.6.27
+++ b/target/linux/ixp4xx/config-2.6.27
@@ -1,7 +1,6 @@
 # CONFIG_8139TOO is not set
 # CONFIG_AEABI is not set
 CONFIG_ALIGNMENT_TRAP=y
-# CONFIG_ALIM7101_WDT is not set
 # CONFIG_ARCH_AAEC2000 is not set
 # CONFIG_ARCH_ADI_COYOTE is not set
 # CONFIG_ARCH_AT91 is not set
@@ -61,7 +60,6 @@ CONFIG_ATA=m
 # CONFIG_ATA_NONSTANDARD is not set
 # CONFIG_ATA_PIIX is not set
 CONFIG_ATA_SFF=y
-# CONFIG_ATL1E is not set
 # CONFIG_ATM is not set
 # CONFIG_ATMEL is not set
 CONFIG_BASE_SMALL=0
@@ -70,7 +68,6 @@ CONFIG_BITREVERSE=y
 # CONFIG_BONDING is not set
 CONFIG_BOUNCE=y
 # CONFIG_BSD_DISKLABEL is not set
-# CONFIG_BT_HCIBTUSB is not set
 # CONFIG_CIFS_STATS is not set
 CONFIG_CLASSIC_RCU=y
 CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200 init=/etc/preinit"
@@ -88,9 +85,7 @@ CONFIG_CPU_PABRT_NOIFAR=y
 CONFIG_CPU_TLB_V4WBI=y
 CONFIG_CPU_XSCALE=y
 CONFIG_CRC16=y
-# CONFIG_CRC_T10DIF is not set
 # CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_DEBUG_MEMORY_INIT is not set
 # CONFIG_DEBUG_USER is not set
 CONFIG_DEFAULT_TCP_CONG="westwood"
 # CONFIG_DEFAULT_VEGAS is not set
@@ -99,7 +94,6 @@ CONFIG_DEVPORT=y
 # CONFIG_DM9000 is not set
 CONFIG_DMABOUNCE=y
 CONFIG_DMABOUNCE_DEBUG=y
-# CONFIG_DMADEVICES is not set
 CONFIG_DNOTIFY=y
 CONFIG_EXTRA_FIRMWARE=""
 CONFIG_FIRMWARE_IN_KERNEL=y
@@ -137,7 +131,6 @@ CONFIG_HAVE_OPROFILE=y
 # CONFIG_HERMES is not set
 CONFIG_HID=m
 CONFIG_HID_SUPPORT=y
-# CONFIG_HP_ILO is not set
 CONFIG_HWMON=y
 # CONFIG_HWMON_DEBUG_CHIP is not set
 CONFIG_HWMON_VID=y
@@ -303,7 +296,6 @@ CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_LIB=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
-# CONFIG_SCSI_DH is not set
 # CONFIG_SCSI_MULTI_LUN is not set
 CONFIG_SCSI_WAIT_SCAN=m
 # CONFIG_SENSORS_AD7414 is not set
@@ -318,14 +310,12 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 # CONFIG_SHMEM is not set
 CONFIG_SLABINFO=y
 # CONFIG_SND_ARM is not set
-CONFIG_SND_DRIVERS=y
 CONFIG_SND_USB=y
 # CONFIG_SOFT_WATCHDOG is not set
 # CONFIG_SPARSEMEM_STATIC is not set
 # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4096
 CONFIG_SSB_POSSIBLE=y
-CONFIG_STP=y
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 # CONFIG_TCP_CONG_HSTCP is not set
@@ -349,7 +339,6 @@ CONFIG_USB_EHCI_TT_NEWSCHED=y
 CONFIG_USB_OHCI_HCD=m
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_UHCI_HCD=m
-# CONFIG_USE_GENERIC_SMP_HELPERS is not set
 CONFIG_VECTORS_BASE=0xffff0000
 # CONFIG_VGASTATE is not set
 # CONFIG_VIA_RHINE is not set
@@ -359,7 +348,6 @@ CONFIG_VIDEO_V4L2=m
 CONFIG_VIDEO_V4L2_COMMON=m
 # CONFIG_VLAN_8021Q_GVRP is not set
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_XFRM_IPCOMP=m
 CONFIG_XSCALE_PMU=y
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_ZBOOT_ROM_TEXT=0x0