aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2009-03-01 20:07:56 +0000
committerHauke Mehrtens <hauke@openwrt.org>2009-03-01 20:07:56 +0000
commite1b6850f78bbc0791216d28c09a24ab81737d30d (patch)
tree21fb345d706a83d5b12601e8c732e567608509d3
parent99937b9662a3eb9dcc45ce52f3c9c32e56bfa130 (diff)
downloadupstream-e1b6850f78bbc0791216d28c09a24ab81737d30d.tar.gz
upstream-e1b6850f78bbc0791216d28c09a24ab81737d30d.tar.bz2
upstream-e1b6850f78bbc0791216d28c09a24ab81737d30d.zip
[x86] add BLK_DEV_PIIX symbol needed for Virtual Box.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14719 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/x86/config-2.6.2775
-rw-r--r--target/linux/x86/config-2.6.28100
2 files changed, 4 insertions, 171 deletions
diff --git a/target/linux/x86/config-2.6.27 b/target/linux/x86/config-2.6.27
index a2623a81b2..5983c4c7aa 100644
--- a/target/linux/x86/config-2.6.27
+++ b/target/linux/x86/config-2.6.27
@@ -3,21 +3,17 @@ CONFIG_4KSTACKS=y
# CONFIG_60XX_WDT is not set
# CONFIG_64BIT is not set
# CONFIG_8139TOO is not set
-# 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_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_APRICOT is not set
CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
CONFIG_ARCH_HAS_CPU_RELAX=y
+CONFIG_ARCH_HAS_DEFAULT_IDLE=y
# CONFIG_ARCH_HAS_ILOG2_U32 is not set
# CONFIG_ARCH_HAS_ILOG2_U64 is not set
CONFIG_ARCH_HIBERNATION_POSSIBLE=y
@@ -31,8 +27,6 @@ CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
CONFIG_ARCH_SUSPEND_POSSIBLE=y
CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
# CONFIG_AT1700 is not set
-# CONFIG_ATA is not set
-# CONFIG_ATA_NONSTANDARD is not set
# CONFIG_AUDIT_ARCH is not set
CONFIG_BASE_SMALL=0
# CONFIG_BINFMT_AOUT is not set
@@ -55,7 +49,6 @@ CONFIG_BLK_DEV_SC1200=y
CONFIG_BLK_DEV_VIA82CXXX=y
# CONFIG_BLK_DEV_XD is not set
CONFIG_BOUNCE=y
-# CONFIG_BT_HIDP is not set
CONFIG_CLASSIC_RCU=y
CONFIG_CLOCKSOURCE_WATCHDOG=y
CONFIG_COMPAT_VDSO=y
@@ -78,7 +71,6 @@ CONFIG_CPU_FREQ_STAT_DETAILS=y
CONFIG_CPU_FREQ_TABLE=y
# CONFIG_CPU_IDLE is not set
# CONFIG_CRYPTO_AES_586 is not set
-# CONFIG_CRYPTO_GF128MUL is not set
# CONFIG_CRYPTO_SALSA20_586 is not set
# CONFIG_CRYPTO_TWOFISH_586 is not set
# CONFIG_CS5535_GPIO is not set
@@ -90,14 +82,11 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
# CONFIG_DELL_RBU is not set
# CONFIG_DEPCA is not set
CONFIG_DEVPORT=y
-# CONFIG_DMASCC is not set
CONFIG_DMI=y
# CONFIG_DMIID is not set
CONFIG_DNOTIFY=y
CONFIG_DOUBLEFAULT=y
CONFIG_DUMMY_CONSOLE=y
-# CONFIG_E1000 is not set
-# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
CONFIG_EARLY_PRINTK=y
# CONFIG_EDAC is not set
# CONFIG_EDD is not set
@@ -115,7 +104,6 @@ CONFIG_FAST_CMPXCHG_LOCAL=y
CONFIG_FIRMWARE_IN_KERNEL=y
CONFIG_FIRMWARE_MEMMAP=y
CONFIG_FIX_EARLYCON_MEM=y
-CONFIG_FS_POSIX_ACL=y
CONFIG_GENERIC_BUG=y
CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
@@ -127,7 +115,6 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
# CONFIG_GENERIC_GPIO is not set
CONFIG_GENERIC_IOMAP=y
CONFIG_GENERIC_ISA_DMA=y
-CONFIG_GENERIC_PENDING_IRQ=y
# CONFIG_GENERIC_LOCKBREAK is not set
# CONFIG_GENERIC_TIME_VSYSCALL is not set
# CONFIG_HANGCHECK_TIMER is not set
@@ -161,9 +148,6 @@ CONFIG_HID_SUPPORT=y
# CONFIG_HP_WATCHDOG is not set
CONFIG_HT_IRQ=y
# CONFIG_HUGETLBFS is not set
-# CONFIG_HWMON is not set
-# CONFIG_HWMON_DEBUG_CHIP is not set
-# CONFIG_HWMON_VID is not set
CONFIG_HW_CONSOLE=y
CONFIG_HW_RANDOM=y
# CONFIG_HW_RANDOM_AMD is not set
@@ -171,11 +155,7 @@ CONFIG_HW_RANDOM_GEODE=y
# CONFIG_HW_RANDOM_INTEL is not set
CONFIG_HW_RANDOM_VIA=y
# CONFIG_I2C is not set
-# CONFIG_I2C_ALGOBIT is not set
-CONFIG_I2C_BOARDINFO=y
-# CONFIG_I2C_CHARDEV is not set
# 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
@@ -187,7 +167,6 @@ CONFIG_IDE_GENERIC=y
CONFIG_IDE_TIMINGS=y
CONFIG_INITRAMFS_SOURCE=""
CONFIG_INPUT=y
-# CONFIG_INPUT_EVDEV is not set
CONFIG_INPUT_KEYBOARD=y
CONFIG_INPUT_MOUSE=y
CONFIG_INPUT_MOUSEDEV=y
@@ -203,7 +182,6 @@ CONFIG_IO_DELAY_TYPE_0XED=1
CONFIG_IO_DELAY_TYPE_NONE=3
CONFIG_IO_DELAY_TYPE_UDELAY=2
# CONFIG_IO_DELAY_UDELAY is not set
-CONFIG_IRQBALANCE=y
CONFIG_ISA=y
CONFIG_ISAPNP=y
CONFIG_ISA_DMA_API=y
@@ -223,9 +201,6 @@ CONFIG_KTIME_SCALAR=y
# CONFIG_LANCE is not set
# CONFIG_LEDS_ALIX is not set
# CONFIG_LEDS_CLEVO_MAIL is not set
-# CONFIG_LEDS_NET48XX is not set
-# CONFIG_LEDS_WRAP is not set
-CONFIG_LOCK_KERNEL=y
CONFIG_M386=y
# CONFIG_M486 is not set
# CONFIG_M586 is not set
@@ -240,15 +215,6 @@ CONFIG_MATH_EMULATION=y
# CONFIG_MCRUSOE is not set
# CONFIG_MCYRIXIII is not set
# CONFIG_MDA_CONSOLE is not set
-# CONFIG_MEDIA_TUNER is not set
-# CONFIG_MEDIA_TUNER_MT20XX is not set
-# CONFIG_MEDIA_TUNER_SIMPLE is not set
-# CONFIG_MEDIA_TUNER_TDA8290 is not set
-# CONFIG_MEDIA_TUNER_TDA9887 is not set
-# CONFIG_MEDIA_TUNER_TEA5761 is not set
-# CONFIG_MEDIA_TUNER_TEA5767 is not set
-# CONFIG_MEDIA_TUNER_XC2028 is not set
-# CONFIG_MEDIA_TUNER_XC5000 is not set
# CONFIG_MEFFICEON is not set
# CONFIG_MEMTEST is not set
# CONFIG_MFD_CORE is not set
@@ -317,11 +283,9 @@ CONFIG_MTRR=y
# CONFIG_MWINCHIPC6 is not set
CONFIG_NAMESPACES=y
# CONFIG_NATSEMI is not set
-# CONFIG_NE2K_PCI is not set
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_NSC_GPIO is not set
CONFIG_NVRAM=y
@@ -332,8 +296,6 @@ CONFIG_PAGE_OFFSET=0xC0000000
# CONFIG_PARAVIRT_GUEST is not set
# CONFIG_PC8736x_GPIO is not set
# CONFIG_PC87413_WDT is not set
-# CONFIG_PCCARD is not set
-# CONFIG_PCCARD_NONSTATIC is not set
CONFIG_PCI=y
# CONFIG_PCIEPORTBUS is not set
CONFIG_PCI_BIOS=y
@@ -344,11 +306,6 @@ CONFIG_PCI_GOANY=y
# CONFIG_PCI_GODIRECT is not set
# CONFIG_PCI_GOMMCONFIG is not set
# CONFIG_PCI_GOOLPC is not set
-# CONFIG_PCMCIA is not set
-CONFIG_PCMCIA_IOCTL=y
-CONFIG_PCMCIA_LOAD_CIS=y
-CONFIG_PCMCIA_PROBE=y
-# CONFIG_PCNET32 is not set
CONFIG_PCSPKR_PLATFORM=y
# CONFIG_PCWATCHDOG is not set
CONFIG_PHYSICAL_ALIGN=0x100000
@@ -361,7 +318,6 @@ CONFIG_PROC_PAGE_MONITOR=y
# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
# CONFIG_R6040 is not set
# CONFIG_RELOCATABLE is not set
-CONFIG_RFKILL_LEDS=y
CONFIG_RTC=y
CONFIG_RWSEM_GENERIC_SPINLOCK=y
# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
@@ -370,20 +326,13 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
# CONFIG_SBC_EPX_C3_WATCHDOG is not set
# CONFIG_SC1200_WDT is not set
# CONFIG_SC520_WDT is not set
-# CONFIG_SCC is not set
# CONFIG_SCHED_HRTICK is not set
CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-# CONFIG_SCSI_WAIT_SCAN is not set
+# CONFIG_SCSI_DMA is not set
CONFIG_SCx200=y
CONFIG_SCx200HR_TIMER=y
-# CONFIG_SCx200_ACB is not set
# CONFIG_SCx200_GPIO is not set
-# CONFIG_SCx200_I2C is not set
-CONFIG_SCx200_I2C_SCL=12
-CONFIG_SCx200_I2C_SDA=13
# CONFIG_SCx200_WDT is not set
-# CONFIG_SENSORS_PC87360 is not set
-# CONFIG_SERIAL_8250_CS is not set
# CONFIG_SERIAL_8250_EXTENDED is not set
CONFIG_SERIAL_8250_PCI=y
CONFIG_SERIAL_8250_PNP=y
@@ -396,8 +345,6 @@ CONFIG_SERIO_LIBPS2=y
CONFIG_SERIO_SERPORT=y
# CONFIG_SMP is not set
# CONFIG_SMSC37B787_WDT is not set
-CONFIG_SND_ISA=y
-# CONFIG_SND_SC6000 is not set
# CONFIG_SOFT_WATCHDOG is not set
# CONFIG_SONYPI is not set
CONFIG_SPARSEMEM_STATIC=y
@@ -406,31 +353,18 @@ CONFIG_SSB_POSSIBLE=y
CONFIG_STRICT_DEVMEM=y
# CONFIG_SYSPROF_TRACER is not set
CONFIG_SYSVIPC_SYSCTL=y
-# CONFIG_TCIC is not set
# 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_USB is not set
-# CONFIG_USB_EHCI_HCD is not set
-# 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 is not set
-# CONFIG_USB_SERIAL_OTI6858 is not set
CONFIG_USB_SUPPORT=y
-# CONFIG_USB_UHCI_HCD 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 is not set
-CONFIG_VIA_RHINE_MMIO=y
-# CONFIG_VIDEO_MEDIA is not set
# CONFIG_VIDEO_SELECT is not set
-# CONFIG_VIDEO_V4L2 is not set
-# CONFIG_VIDEO_V4L2_COMMON is not set
CONFIG_VM86=y
CONFIG_VM_EVENT_COUNTERS=y
# CONFIG_VORTEX is not set
@@ -485,9 +419,4 @@ CONFIG_X86_UP_IOAPIC=y
CONFIG_X86_VERBOSE_BOOTUP=y
# CONFIG_X86_VOYAGER is not set
# CONFIG_X86_VSMP is not set
-CONFIG_YENTA_ENE_TUNE=y
-CONFIG_YENTA_O2=y
-CONFIG_YENTA_RICOH=y
-CONFIG_YENTA_TI=y
-CONFIG_YENTA_TOSHIBA=y
# CONFIG_ZONE_DMA32 is not set
diff --git a/target/linux/x86/config-2.6.28 b/target/linux/x86/config-2.6.28
index 60001c2ff5..aa92432b73 100644
--- a/target/linux/x86/config-2.6.28
+++ b/target/linux/x86/config-2.6.28
@@ -3,15 +3,10 @@ CONFIG_4KSTACKS=y
# CONFIG_60XX_WDT is not set
# CONFIG_64BIT is not set
# CONFIG_8139TOO is not set
-# 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_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_APRICOT is not set
CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
@@ -30,8 +25,6 @@ CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
CONFIG_ARCH_SUSPEND_POSSIBLE=y
CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
# CONFIG_AT1700 is not set
-# CONFIG_ATA is not set
-# CONFIG_ATA_NONSTANDARD is not set
# CONFIG_AUDIT_ARCH is not set
CONFIG_BASE_SMALL=0
# CONFIG_BINFMT_AOUT is not set
@@ -47,13 +40,13 @@ CONFIG_BLK_DEV_IDEDMA=y
CONFIG_BLK_DEV_IDEDMA_PCI=y
CONFIG_BLK_DEV_IDEDMA_SFF=y
CONFIG_BLK_DEV_IDEPCI=y
+CONFIG_BLK_DEV_PIIX=y
# 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_HIDP is not set
CONFIG_CLASSIC_RCU=y
CONFIG_CLOCKSOURCE_WATCHDOG=y
# CONFIG_CMDLINE_BOOL is not set
@@ -81,15 +74,8 @@ CONFIG_CPU_SUP_CYRIX_32=y
CONFIG_CPU_SUP_INTEL=y
CONFIG_CPU_SUP_TRANSMETA_32=y
CONFIG_CPU_SUP_UMC_32=y
-# CONFIG_CRYPTO_AEAD2 is not set
# CONFIG_CRYPTO_AES_586 is not set
-# CONFIG_CRYPTO_ALGAPI2 is not set
-# CONFIG_CRYPTO_BLKCIPHER2 is not set
# CONFIG_CRYPTO_CRC32C_INTEL is not set
-# CONFIG_CRYPTO_GF128MUL is not set
-# CONFIG_CRYPTO_HASH2 is not set
-# CONFIG_CRYPTO_MANAGER2 is not set
-# CONFIG_CRYPTO_RNG2 is not set
# CONFIG_CRYPTO_SALSA20_586 is not set
# CONFIG_CRYPTO_TWOFISH_586 is not set
# CONFIG_CS5535_GPIO is not set
@@ -101,13 +87,11 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
# CONFIG_DELL_RBU is not set
# CONFIG_DEPCA is not set
CONFIG_DEVPORT=y
-# CONFIG_DMASCC is not set
CONFIG_DMI=y
# CONFIG_DMIID is not set
CONFIG_DNOTIFY=y
CONFIG_DOUBLEFAULT=y
CONFIG_DUMMY_CONSOLE=y
-# CONFIG_E1000 is not set
CONFIG_EARLY_PRINTK=y
# CONFIG_EARLY_PRINTK_DBGP is not set
# CONFIG_EDAC is not set
@@ -127,7 +111,6 @@ CONFIG_FIRMWARE_IN_KERNEL=y
CONFIG_FIRMWARE_MEMMAP=y
CONFIG_FIX_EARLYCON_MEM=y
# CONFIG_FREEZER is not set
-CONFIG_FS_POSIX_ACL=y
CONFIG_GENERIC_BUG=y
CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
@@ -163,25 +146,7 @@ CONFIG_HAVE_OPROFILE=y
# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
CONFIG_HID=y
-# CONFIG_HID_A4TECH is not set
-# CONFIG_HID_APPLE is not set
-# CONFIG_HID_BELKIN is not set
-# CONFIG_HID_BRIGHT is not set
-# CONFIG_HID_CHERRY is not set
-# CONFIG_HID_CHICONY is not set
CONFIG_HID_COMPAT=y
-# CONFIG_HID_CYPRESS is not set
-# CONFIG_HID_DELL is not set
-# CONFIG_HID_EZKEY is not set
-# CONFIG_HID_GYRATION is not set
-# CONFIG_HID_LOGITECH is not set
-# CONFIG_HID_MICROSOFT is not set
-# CONFIG_HID_MONTEREY is not set
-# CONFIG_HID_PANTHERLORD is not set
-# CONFIG_HID_PETALYNX is not set
-# CONFIG_HID_SAMSUNG is not set
-# CONFIG_HID_SONY is not set
-# CONFIG_HID_SUNPLUS is not set
CONFIG_HID_SUPPORT=y
# CONFIG_HIGHMEM4G is not set
# CONFIG_HIGHMEM64G is not set
@@ -190,9 +155,6 @@ CONFIG_HID_SUPPORT=y
# CONFIG_HP_WATCHDOG is not set
CONFIG_HT_IRQ=y
# CONFIG_HUGETLBFS is not set
-# CONFIG_HWMON is not set
-# CONFIG_HWMON_DEBUG_CHIP is not set
-# CONFIG_HWMON_VID is not set
CONFIG_HW_CONSOLE=y
CONFIG_HW_RANDOM=y
# CONFIG_HW_RANDOM_AMD is not set
@@ -200,11 +162,7 @@ CONFIG_HW_RANDOM_GEODE=y
# CONFIG_HW_RANDOM_INTEL is not set
CONFIG_HW_RANDOM_VIA=y
# CONFIG_I2C is not set
-# CONFIG_I2C_ALGOBIT is not set
-CONFIG_I2C_BOARDINFO=y
-# CONFIG_I2C_CHARDEV is not set
# 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
@@ -222,7 +180,6 @@ CONFIG_IDE_GENERIC=y
CONFIG_IDE_TIMINGS=y
CONFIG_INITRAMFS_SOURCE=""
CONFIG_INPUT=y
-# CONFIG_INPUT_EVDEV is not set
CONFIG_INPUT_KEYBOARD=y
CONFIG_INPUT_MOUSE=y
CONFIG_INPUT_MOUSEDEV=y
@@ -258,10 +215,6 @@ CONFIG_KTIME_SCALAR=y
# CONFIG_LANCE is not set
# CONFIG_LEDS_ALIX is not set
# CONFIG_LEDS_CLEVO_MAIL is not set
-# CONFIG_LEDS_NET48XX is not set
-# CONFIG_LEDS_WRAP is not set
-# CONFIG_LOGIRUMBLEPAD2_FF is not set
-# CONFIG_LOGITECH_FF is not set
CONFIG_M386=y
# CONFIG_M486 is not set
# CONFIG_M586 is not set
@@ -276,15 +229,6 @@ CONFIG_MATH_EMULATION=y
# CONFIG_MCRUSOE is not set
# CONFIG_MCYRIXIII is not set
# CONFIG_MDA_CONSOLE is not set
-# CONFIG_MEDIA_TUNER is not set
-# CONFIG_MEDIA_TUNER_MT20XX is not set
-# CONFIG_MEDIA_TUNER_SIMPLE is not set
-# CONFIG_MEDIA_TUNER_TDA8290 is not set
-# CONFIG_MEDIA_TUNER_TDA9887 is not set
-# CONFIG_MEDIA_TUNER_TEA5761 is not set
-# CONFIG_MEDIA_TUNER_TEA5767 is not set
-# CONFIG_MEDIA_TUNER_XC2028 is not set
-# CONFIG_MEDIA_TUNER_XC5000 is not set
# CONFIG_MEFFICEON is not set
# CONFIG_MEMTEST is not set
# CONFIG_MFD_CORE is not set
@@ -355,11 +299,9 @@ CONFIG_MTRR=y
# CONFIG_MWINCHIPC6 is not set
CONFIG_NAMESPACES=y
# CONFIG_NATSEMI is not set
-# CONFIG_NE2K_PCI is not set
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_NF_DEFRAG_IPV4 is not set
CONFIG_NOHIGHMEM=y
# CONFIG_NSC_GPIO is not set
@@ -368,12 +310,9 @@ CONFIG_NVRAM=y
# CONFIG_OPTIMIZE_INLINING is not set
CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_PAGE_OFFSET=0xC0000000
-# CONFIG_PANTHERLORD_FF is not set
# CONFIG_PARAVIRT_GUEST is not set
# CONFIG_PC8736x_GPIO is not set
# CONFIG_PC87413_WDT is not set
-# CONFIG_PCCARD is not set
-# CONFIG_PCCARD_NONSTATIC is not set
CONFIG_PCI=y
# CONFIG_PCIEPORTBUS is not set
CONFIG_PCI_BIOS=y
@@ -384,11 +323,6 @@ CONFIG_PCI_GOANY=y
# CONFIG_PCI_GODIRECT is not set
# CONFIG_PCI_GOMMCONFIG is not set
# CONFIG_PCI_GOOLPC is not set
-# CONFIG_PCMCIA is not set
-CONFIG_PCMCIA_IOCTL=y
-CONFIG_PCMCIA_LOAD_CIS=y
-CONFIG_PCMCIA_PROBE=y
-# CONFIG_PCNET32 is not set
CONFIG_PCSPKR_PLATFORM=y
# CONFIG_PCWATCHDOG is not set
CONFIG_PHYSICAL_ALIGN=0x100000
@@ -402,7 +336,6 @@ CONFIG_PROC_PAGE_MONITOR=y
# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
# CONFIG_R6040 is not set
# CONFIG_RELOCATABLE is not set
-CONFIG_RFKILL_LEDS=y
CONFIG_RTC=y
CONFIG_RWSEM_GENERIC_SPINLOCK=y
# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
@@ -411,20 +344,13 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
# CONFIG_SBC_EPX_C3_WATCHDOG is not set
# CONFIG_SC1200_WDT is not set
# CONFIG_SC520_WDT is not set
-# CONFIG_SCC is not set
# CONFIG_SCHED_HRTICK is not set
CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-# CONFIG_SCSI_WAIT_SCAN is not set
+# CONFIG_SCSI_DMA is not set
CONFIG_SCx200=y
CONFIG_SCx200HR_TIMER=y
-# CONFIG_SCx200_ACB is not set
# CONFIG_SCx200_GPIO is not set
-# CONFIG_SCx200_I2C is not set
-CONFIG_SCx200_I2C_SCL=12
-CONFIG_SCx200_I2C_SDA=13
# CONFIG_SCx200_WDT is not set
-# CONFIG_SENSORS_PC87360 is not set
-# CONFIG_SERIAL_8250_CS is not set
# CONFIG_SERIAL_8250_EXTENDED is not set
CONFIG_SERIAL_8250_PCI=y
CONFIG_SERIAL_8250_PNP=y
@@ -442,40 +368,23 @@ CONFIG_SLUB_DEBUG=y
# CONFIG_SLUB_STATS is not set
# CONFIG_SMP is not set
# CONFIG_SMSC37B787_WDT is not set
-CONFIG_SND_ISA=y
-# CONFIG_SND_SC6000 is not set
-# CONFIG_SND_USB_US122L is not set
# CONFIG_SOFT_WATCHDOG is not set
# CONFIG_SONYPI is not set
-CONFIG_SOUND_OSS_CORE=y
CONFIG_SPARSEMEM_STATIC=y
CONFIG_SSB_POSSIBLE=y
CONFIG_STRICT_DEVMEM=y
# CONFIG_SYSPROF_TRACER is not set
CONFIG_SYSVIPC_SYSCTL=y
-# CONFIG_TCIC is not set
# CONFIG_TELCLOCK is not set
# CONFIG_TOSHIBA is not set
# CONFIG_TYPHOON is not set
CONFIG_UID16=y
-# CONFIG_USB is not set
-# CONFIG_USB_EHCI_HCD is not set
-# 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 is not set
-# CONFIG_USB_SERIAL_OTI6858 is not set
CONFIG_USB_SUPPORT=y
-# CONFIG_USB_UHCI_HCD 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 is not set
-CONFIG_VIA_RHINE_MMIO=y
-# CONFIG_VIDEO_MEDIA is not set
-# CONFIG_VIDEO_V4L2 is not set
-# CONFIG_VIDEO_V4L2_COMMON is not set
CONFIG_VM86=y
CONFIG_VM_EVENT_COUNTERS=y
# CONFIG_VORTEX is not set
@@ -532,9 +441,4 @@ CONFIG_X86_UP_IOAPIC=y
CONFIG_X86_VERBOSE_BOOTUP=y
# CONFIG_X86_VOYAGER is not set
# CONFIG_X86_VSMP is not set
-CONFIG_YENTA_ENE_TUNE=y
-CONFIG_YENTA_O2=y
-CONFIG_YENTA_RICOH=y
-CONFIG_YENTA_TI=y
-CONFIG_YENTA_TOSHIBA=y
# CONFIG_ZONE_DMA32 is not set