[x86] resync kernel configurations, patch from Hauke Mehrtens (#4396)

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

5 files changed, 11 insertions, 97 deletions

diff --git a/target/linux/x86/config-2.6.23 b/target/linux/x86/config-2.6.23
index 73927c7a51..27339b6ed4 100644
--- a/target/linux/x86/config-2.6.23
+++ b/target/linux/x86/config-2.6.23
@@ -1,18 +1,9 @@
 # CONFIG_3C515 is not set
 # CONFIG_60XX_WDT is not set
-CONFIG_8139TOO=m
-# CONFIG_8139TOO_8129 is not set
-CONFIG_8139TOO_PIO=y
-# CONFIG_8139TOO_TUNE_TWISTER is not set
-# CONFIG_8139_OLD_RX_RESET is not set
 # CONFIG_AC3200 is not set
-CONFIG_AC97_BUS=m
 # CONFIG_ACQUIRE_WDT is not set
 # CONFIG_ADVANTECH_WDT is not set
-# CONFIG_AGP is not set
 # CONFIG_AIRO_CS is not set
-# CONFIG_ALIM1535_WDT is not set
-# CONFIG_ALIM7101_WDT is not set
 # CONFIG_APRICOT is not set
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
@@ -20,23 +11,17 @@ CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_ARCH_POPULATES_NODE_MAP=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_SUPPORTS_MSI=y
+# CONFIG_ARCH_SUPPORTS_MSI is not set
 # CONFIG_AT1700 is not set
 CONFIG_ATA=m
 # CONFIG_ATA_NONSTANDARD is not set
-CONFIG_ATA_PIIX=m
 CONFIG_BASE_SMALL=0
 # CONFIG_BINFMT_AOUT is not set
 CONFIG_BINFMT_MISC=y
 CONFIG_BITREVERSE=y
-CONFIG_BLK_DEV_GENERIC=y
 CONFIG_BLK_DEV_IDE=y
 CONFIG_BLK_DEV_IDEDISK=y
-CONFIG_BLK_DEV_IDEDMA=y
-CONFIG_BLK_DEV_IDEDMA_PCI=y
-CONFIG_BLK_DEV_IDEPCI=y
-CONFIG_BLK_DEV_SC1200=y
-CONFIG_BLK_DEV_VIA82CXXX=y
+# CONFIG_BLK_DEV_IDEDMA is not set
 # CONFIG_BLK_DEV_XD is not set
 CONFIG_BOUNCE=y
 # CONFIG_BT_HIDP is not set
@@ -70,9 +55,6 @@ CONFIG_DMI=y
 CONFIG_DNOTIFY=y
 CONFIG_DOUBLEFAULT=y
 CONFIG_DUMMY_CONSOLE=y
-CONFIG_E1000=m
-# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
-CONFIG_E1000_NAPI=y
 CONFIG_EARLY_PRINTK=y
 # CONFIG_EDAC is not set
 # CONFIG_EDD is not set
@@ -106,31 +88,23 @@ CONFIG_HID_SUPPORT=y
 # CONFIG_HIGHMEM64G is not set
 # CONFIG_HIGH_RES_TIMERS is not set
 # CONFIG_HPET_TIMER is not set
-CONFIG_HT_IRQ=y
 # CONFIG_HUGETLBFS is not set
 CONFIG_HWMON=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
 CONFIG_HWMON_VID=m
 CONFIG_HW_CONSOLE=y
 CONFIG_HW_RANDOM=y
-# CONFIG_HW_RANDOM_AMD is not set
-CONFIG_HW_RANDOM_GEODE=y
-# CONFIG_HW_RANDOM_INTEL is not set
 CONFIG_HW_RANDOM_VIA=y
 CONFIG_I2C=m
 CONFIG_I2C_ALGOBIT=m
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CHARDEV=m
-# CONFIG_I6300ESB_WDT is not set
 # CONFIG_I82365 is not set
 # CONFIG_I8K is not set
 # CONFIG_IB700_WDT is not set
 # CONFIG_IBMASR is not set
-# CONFIG_IBM_ASM is not set
 CONFIG_IDE=y
-# CONFIG_IDEDMA_IVB is not set
-# CONFIG_IDEDMA_ONLYDISK is not set
-CONFIG_IDEPCI_PCIBUS_ORDER=y
+# CONFIG_IDEPCI_PCIBUS_ORDER is not set
 # CONFIG_IDE_ARM is not set
 # CONFIG_IDE_CHIPSETS is not set
 CONFIG_IDE_GENERIC=y
@@ -149,7 +123,6 @@ CONFIG_IRQBALANCE=y
 CONFIG_ISA=y
 CONFIG_ISAPNP=y
 CONFIG_ISA_DMA_API=y
-# CONFIG_ITCO_WDT is not set
 CONFIG_KALLSYMS=y
 CONFIG_KEXEC=y
 CONFIG_KEYBOARD_ATKBD=y
@@ -160,6 +133,7 @@ CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_XTKBD is not set
 CONFIG_KTIME_SCALAR=y
 # CONFIG_LANCE is not set
+CONFIG_LEDS_ALIX=m
 CONFIG_LEDS_NET48XX=m
 # CONFIG_LEDS_WRAP is not set
 CONFIG_LOCK_KERNEL=y
@@ -229,7 +203,6 @@ CONFIG_MTD_MAP_BANK_WIDTH_4=y
 CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_PHRAM is not set
 # CONFIG_MTD_PLATRAM is not set
-# CONFIG_MTD_PMC551 is not set
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_REDBOOT_PARTS is not set
 # CONFIG_MTD_ROM is not set
@@ -241,14 +214,12 @@ CONFIG_MTRR=y
 # CONFIG_MWINCHIP2 is not set
 # CONFIG_MWINCHIP3D is not set
 # CONFIG_MWINCHIPC6 is not set
-CONFIG_NATSEMI=m
-CONFIG_NE2K_PCI=m
 CONFIG_NETDEV_1000=y
 CONFIG_NET_VENDOR_3COM=y
 # CONFIG_NET_VENDOR_RACAL is not set
 # CONFIG_NET_VENDOR_SMC is not set
+CONFIG_NF_CONNTRACK=y
 CONFIG_NOHIGHMEM=y
-# CONFIG_NO_HZ is not set
 CONFIG_NR_CPUS=8
 CONFIG_NR_QUICK=1
 CONFIG_NSC_GPIO=m
@@ -258,22 +229,10 @@ CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_PC8736x_GPIO=m
 # CONFIG_PC87413_WDT is not set
 CONFIG_PCCARD=m
-CONFIG_PCCARD_NONSTATIC=m
-# CONFIG_PCIEPORTBUS is not set
-# CONFIG_PCIPCWATCHDOG is not set
-CONFIG_PCI_BIOS=y
-CONFIG_PCI_DIRECT=y
-CONFIG_PCI_GOANY=y
-# CONFIG_PCI_GOBIOS is not set
-# CONFIG_PCI_GODIRECT is not set
-# CONFIG_PCI_GOMMCONFIG is not set
-# CONFIG_PCI_MSI is not set
 CONFIG_PCMCIA=m
 CONFIG_PCMCIA_IOCTL=y
 CONFIG_PCMCIA_LOAD_CIS=y
 CONFIG_PCMCIA_PROBE=y
-CONFIG_PCNET32=m
-CONFIG_PCNET32_NAPI=y
 # CONFIG_PCWATCHDOG is not set
 CONFIG_PHYSICAL_ALIGN=0x100000
 CONFIG_PHYSICAL_START=0x100000
@@ -297,34 +256,24 @@ CONFIG_SCHED_SMT=y
 CONFIG_SCSI_WAIT_SCAN=m
 CONFIG_SCx200=y
 CONFIG_SCx200HR_TIMER=y
-CONFIG_SCx200_ACB=m
 CONFIG_SCx200_GPIO=m
 CONFIG_SCx200_I2C=m
 CONFIG_SCx200_I2C_SCL=12
 CONFIG_SCx200_I2C_SDA=13
-CONFIG_SCx200_WDT=m
 CONFIG_SEMAPHORE_SLEEPERS=y
 CONFIG_SENSORS_PC87360=m
 # CONFIG_SERIAL_8250_CS is not set
 # CONFIG_SERIAL_8250_EXTENDED is not set
-CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_8250_PNP=y
 CONFIG_SERIO=y
 # CONFIG_SERIO_CT82C710 is not set
 CONFIG_SERIO_I8042=y
 CONFIG_SERIO_LIBPS2=y
-# CONFIG_SERIO_PCIPS2 is not set
 # CONFIG_SERIO_RAW is not set
 CONFIG_SERIO_SERPORT=y
 CONFIG_SMP=y
 # CONFIG_SMSC37B787_WDT is not set
-CONFIG_SND_AC97_CODEC=m
-# CONFIG_SND_AC97_POWER_SAVE is not set
-# CONFIG_SND_CS5530 is not set
-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
@@ -333,30 +282,17 @@ CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_TELCLOCK is not set
 # CONFIG_TICK_ONESHOT is not set
 # CONFIG_TOSHIBA is not set
-# CONFIG_TYPHOON is not set
 CONFIG_UID16=y
-# CONFIG_USBPCWATCHDOG is not set
-CONFIG_USB_EHCI_HCD=m
-CONFIG_USB_EHCI_SPLIT_ISO=y
-# CONFIG_USB_NET_DM9601 is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-CONFIG_USB_OHCI_HCD=m
-# CONFIG_USB_R8A66597_HCD is not set
-# CONFIG_USB_SERIAL_OTI6858 is not set
-CONFIG_USB_UHCI_HCD=m
+# CONFIG_USB_ARCH_HAS_EHCI is not set
+# CONFIG_USB_ARCH_HAS_OHCI is not set
 # CONFIG_USER_NS is not set
 # CONFIG_VGACON_SOFT_SCROLLBACK is not set
 # CONFIG_VGASTATE is not set
 CONFIG_VGA_CONSOLE=y
-CONFIG_VIA_RHINE=m
-CONFIG_VIA_RHINE_MMIO=y
-CONFIG_VIA_RHINE_NAPI=y
 # CONFIG_VIDEO_SELECT is not set
 # CONFIG_VIRTUALIZATION is not set
 CONFIG_VM86=y
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_VORTEX=m
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 # CONFIG_VT_HW_CONSOLE_BINDING is not set
@@ -375,7 +311,6 @@ CONFIG_X86_F00F_BUG=y
 CONFIG_X86_FIND_SMP_CONFIG=y
 CONFIG_X86_GENERIC=y
 # CONFIG_X86_GENERICARCH is not set
-CONFIG_X86_GX_SUSPMOD=m
 CONFIG_X86_HT=y
 CONFIG_X86_INTEL_USERCOPY=y
 CONFIG_X86_IO_APIC=y
@@ -406,8 +341,3 @@ CONFIG_X86_SMP=y
 CONFIG_X86_TRAMPOLINE=y
 # CONFIG_X86_VISWS is not set
 # CONFIG_X86_VOYAGER is not set
-CONFIG_YENTA_ENE_TUNE=y
-CONFIG_YENTA_O2=y
-CONFIG_YENTA_RICOH=y
-CONFIG_YENTA_TI=y
-CONFIG_YENTA_TOSHIBA=y
diff --git a/target/linux/x86/config-2.6.24 b/target/linux/x86/config-2.6.24
index dbc658faf1..b606b0ff53 100644
--- a/target/linux/x86/config-2.6.24
+++ b/target/linux/x86/config-2.6.24
@@ -42,14 +42,12 @@ CONFIG_BLK_DEV_IDEDISK=y
 CONFIG_BLK_DEV_IDEDMA=y
 CONFIG_BLK_DEV_IDEDMA_PCI=y
 CONFIG_BLK_DEV_IDEPCI=y
-# CONFIG_BLK_DEV_PLATFORM is not set
 # CONFIG_BLK_DEV_QD65XX is not set
 CONFIG_BLK_DEV_SC1200=y
 # CONFIG_BLK_DEV_UMC8672 is not set
 CONFIG_BLK_DEV_VIA82CXXX=y
 # CONFIG_BLK_DEV_XD is not set
 CONFIG_BOUNCE=y
-# CONFIG_BT_HCIUART_LL is not set
 # CONFIG_BT_HIDP is not set
 CONFIG_CLOCKSOURCE_WATCHDOG=y
 CONFIG_COMPAT_VDSO=y
@@ -119,7 +117,6 @@ CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HIBERNATION_SMP_POSSIBLE=y
 CONFIG_HID=y
-# CONFIG_HIDRAW is not set
 CONFIG_HID_SUPPORT=y
 # CONFIG_HIGHMEM4G is not set
 # CONFIG_HIGHMEM64G is not set
@@ -182,7 +179,6 @@ CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_XTKBD is not set
 CONFIG_KTIME_SCALAR=y
 # CONFIG_LANCE is not set
-# CONFIG_LEDS_ALIX is not set
 CONFIG_LEDS_NET48XX=m
 # CONFIG_LEDS_WRAP is not set
 CONFIG_LOCK_KERNEL=y
@@ -271,8 +267,8 @@ CONFIG_NETDEV_1000=y
 CONFIG_NET_VENDOR_3COM=y
 # CONFIG_NET_VENDOR_RACAL is not set
 # CONFIG_NET_VENDOR_SMC is not set
+CONFIG_NF_CONNTRACK=y
 CONFIG_NOHIGHMEM=y
-# CONFIG_NO_HZ is not set
 CONFIG_NR_CPUS=8
 CONFIG_NR_QUICK=1
 CONFIG_NSC_GPIO=m
@@ -280,14 +276,13 @@ CONFIG_NVRAM=y
 CONFIG_PAGE_OFFSET=0xC0000000
 # CONFIG_PARAVIRT_GUEST is not set
 # CONFIG_PATA_CS5536 is not set
-# CONFIG_PATA_NS87415 is not set
 CONFIG_PC8736x_GPIO=m
 # CONFIG_PC87413_WDT is not set
 CONFIG_PCCARD=m
 CONFIG_PCCARD_NONSTATIC=m
+CONFIG_PCI=y
 # CONFIG_PCIEPORTBUS is not set
 # CONFIG_PCIPCWATCHDOG is not set
-CONFIG_PCI=y
 CONFIG_PCI_BIOS=y
 CONFIG_PCI_DIRECT=y
 CONFIG_PCI_DOMAINS=y
@@ -323,7 +318,6 @@ CONFIG_SC1200_WDT=m
 CONFIG_SCHED_MC=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_SCHED_SMT=y
-# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
 CONFIG_SCSI_WAIT_SCAN=m
 CONFIG_SCx200=y
 CONFIG_SCx200HR_TIMER=y
@@ -334,11 +328,6 @@ CONFIG_SCx200_I2C_SCL=12
 CONFIG_SCx200_I2C_SDA=13
 CONFIG_SCx200_WDT=m
 CONFIG_SEMAPHORE_SLEEPERS=y
-# CONFIG_SENSORS_ADT7470 is not set
-# CONFIG_SENSORS_F71882FG is not set
-# CONFIG_SENSORS_F75375S is not set
-# CONFIG_SENSORS_FSCHMD is not set
-# CONFIG_SENSORS_I5K_AMB is not set
 CONFIG_SENSORS_PC87360=m
 # CONFIG_SERIAL_8250_CS is not set
 # CONFIG_SERIAL_8250_EXTENDED is not set
@@ -355,7 +344,6 @@ CONFIG_SLABINFO=y
 CONFIG_SMP=y
 # CONFIG_SMSC37B787_WDT is not set
 CONFIG_SND_AC97_CODEC=m
-# CONFIG_SND_CS5530 is not set
 CONFIG_SND_HDA_CODEC_ANALOG=y
 CONFIG_SND_HDA_CODEC_ATIHDMI=y
 CONFIG_SND_HDA_CODEC_CMEDIA=y
@@ -384,15 +372,14 @@ CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_TOSHIBA is not set
 # CONFIG_TYPHOON is not set
 CONFIG_UID16=y
-# CONFIG_USBPCWATCHDOG is not set
 CONFIG_USB=m
+# CONFIG_USBPCWATCHDOG is not set
 CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_EHCI_SPLIT_ISO=y
 # CONFIG_USB_NET_DM9601 is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_USB_OHCI_HCD=m
-# CONFIG_USB_R8A66597_HCD is not set
 # CONFIG_USB_SERIAL_OTI6858 is not set
 CONFIG_USB_UHCI_HCD=m
 # CONFIG_USER_NS is not set
diff --git a/target/linux/x86/config-2.6.25 b/target/linux/x86/config-2.6.25
index ba50375efd..d2ce9bbf80 100644
--- a/target/linux/x86/config-2.6.25
+++ b/target/linux/x86/config-2.6.25
@@ -50,7 +50,6 @@ CONFIG_BLK_DEV_IDEDMA_SFF=y
 CONFIG_BLK_DEV_IDEPCI=y
 # CONFIG_BLK_DEV_QD65XX is not set
 CONFIG_BLK_DEV_SC1200=y
-# CONFIG_BLK_DEV_SL82C105 is not set
 # CONFIG_BLK_DEV_UMC8672 is not set
 CONFIG_BLK_DEV_VIA82CXXX=y
 # CONFIG_BLK_DEV_XD is not set
@@ -177,7 +176,6 @@ CONFIG_IDE_GENERIC=y
 # CONFIG_IDE_PROC_FS is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INPUT=y
-CONFIG_INPUT_APANEL=n
 # CONFIG_INPUT_EVDEV is not set
 CONFIG_INPUT_KEYBOARD=y
 CONFIG_INPUT_MOUSE=y
@@ -368,7 +366,6 @@ CONFIG_SCx200_I2C_SCL=12
 CONFIG_SCx200_I2C_SDA=13
 CONFIG_SCx200_WDT=m
 CONFIG_SEMAPHORE_SLEEPERS=y
-# CONFIG_SENSORS_FSCHMD is not set
 CONFIG_SENSORS_PC87360=m
 # CONFIG_SERIAL_8250_CS is not set
 # CONFIG_SERIAL_8250_EXTENDED is not set
diff --git a/target/linux/x86/config-2.6.26 b/target/linux/x86/config-2.6.26
index 37f6e659e5..4bd52e11a5 100644
--- a/target/linux/x86/config-2.6.26
+++ b/target/linux/x86/config-2.6.26
@@ -324,7 +324,6 @@ CONFIG_NOHIGHMEM=y
 CONFIG_NR_CPUS=8
 CONFIG_NSC_GPIO=m
 CONFIG_NVRAM=y
-# CONFIG_OCF_OCF is not set
 # CONFIG_OLPC is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xC0000000
diff --git a/target/linux/x86/config-2.6.27 b/target/linux/x86/config-2.6.27
index b76b7d69c8..dd7596cb8c 100644
--- a/target/linux/x86/config-2.6.27
+++ b/target/linux/x86/config-2.6.27
@@ -320,6 +320,7 @@ CONFIG_NE2K_PCI=m
 CONFIG_NET_VENDOR_3COM=y
 # CONFIG_NET_VENDOR_RACAL is not set
 # CONFIG_NET_VENDOR_SMC is not set
+CONFIG_NF_CT_ACCT=y
 CONFIG_NOHIGHMEM=y
 CONFIG_NR_CPUS=8
 CONFIG_NSC_GPIO=m