[atheros] Implement a preliminary combined image format.

[openwrt.git] / target / linux / x86 / config-2.6.28

diff --git a/target/linux/x86/config-2.6.28 b/target/linux/x86/config-2.6.28
index 1557ee1..6283ae0 100644 (file)
--- a/target/linux/x86/config-2.6.28
+++ b/target/linux/x86/config-2.6.28
@@ -2,16 +2,11 @@
 CONFIG_4KSTACKS=y
 # CONFIG_60XX_WDT is not set
 # CONFIG_64BIT is not set
 CONFIG_4KSTACKS=y
 # CONFIG_60XX_WDT is not set
 # CONFIG_64BIT 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_8139TOO 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_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_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_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 # CONFIG_AT1700 is not set

-CONFIG_ATA=m
-# CONFIG_ATA_NONSTANDARD is not set

 # CONFIG_AUDIT_ARCH is not set
 CONFIG_BASE_SMALL=0
 # CONFIG_BINFMT_AOUT is not set
 # CONFIG_AUDIT_ARCH is not set
 CONFIG_BASE_SMALL=0
 # CONFIG_BINFMT_AOUT is not set


@@ -39,6 +32,7 @@ CONFIG_BINFMT_MISC=y
 CONFIG_BITREVERSE=y
 # CONFIG_BLK_DEV_4DRIVES is not set
 # CONFIG_BLK_DEV_ALI14XX is not set
 CONFIG_BITREVERSE=y
 # CONFIG_BLK_DEV_4DRIVES is not set
 # CONFIG_BLK_DEV_ALI14XX is not set

+CONFIG_BLK_DEV_AMD74XX=y

 # CONFIG_BLK_DEV_DTC2278 is not set
 CONFIG_BLK_DEV_GENERIC=y
 # CONFIG_BLK_DEV_HT6560B is not set
 # CONFIG_BLK_DEV_DTC2278 is not set
 CONFIG_BLK_DEV_GENERIC=y
 # CONFIG_BLK_DEV_HT6560B is not set


@@ -46,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_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_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
 CONFIG_CLASSIC_RCU=y
 CONFIG_CLOCKSOURCE_WATCHDOG=y
 # CONFIG_CMDLINE_BOOL is not set


@@ -80,17 +74,6 @@ CONFIG_CPU_SUP_CYRIX_32=y
 CONFIG_CPU_SUP_INTEL=y
 CONFIG_CPU_SUP_TRANSMETA_32=y
 CONFIG_CPU_SUP_UMC_32=y
 CONFIG_CPU_SUP_INTEL=y
 CONFIG_CPU_SUP_TRANSMETA_32=y
 CONFIG_CPU_SUP_UMC_32=y

-CONFIG_CRYPTO_AEAD2=m
-CONFIG_CRYPTO_AES_586=m
-CONFIG_CRYPTO_ALGAPI2=m
-CONFIG_CRYPTO_BLKCIPHER2=m
-# CONFIG_CRYPTO_CRC32C_INTEL is not set
-CONFIG_CRYPTO_GF128MUL=m
-CONFIG_CRYPTO_HASH2=m
-CONFIG_CRYPTO_MANAGER2=m
-CONFIG_CRYPTO_RNG2=m
-# CONFIG_CRYPTO_SALSA20_586 is not set
-CONFIG_CRYPTO_TWOFISH_586=m

 # CONFIG_CS5535_GPIO is not set
 # CONFIG_CS89x0 is not set
 # CONFIG_DCDBAS is not set
 # CONFIG_CS5535_GPIO is not set
 # CONFIG_CS89x0 is not set
 # CONFIG_DCDBAS is not set


@@ -105,7 +88,6 @@ CONFIG_DMI=y
 CONFIG_DNOTIFY=y
 CONFIG_DOUBLEFAULT=y
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_DNOTIFY=y
 CONFIG_DOUBLEFAULT=y
 CONFIG_DUMMY_CONSOLE=y

-CONFIG_E1000=m

 CONFIG_EARLY_PRINTK=y
 # CONFIG_EARLY_PRINTK_DBGP is not set
 # CONFIG_EDAC is not set
 CONFIG_EARLY_PRINTK=y
 # CONFIG_EARLY_PRINTK_DBGP is not set
 # CONFIG_EDAC is not set


@@ -124,8 +106,6 @@ CONFIG_FAST_CMPXCHG_LOCAL=y
 CONFIG_FIRMWARE_IN_KERNEL=y
 CONFIG_FIRMWARE_MEMMAP=y
 CONFIG_FIX_EARLYCON_MEM=y
 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
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y


@@ -136,7 +116,6 @@ CONFIG_GENERIC_FIND_FIRST_BIT=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_GENERIC_IOMAP=y
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_GENERIC_IOMAP=y
 CONFIG_GENERIC_ISA_DMA=y

-CONFIG_GENERIC_PENDING_IRQ=y

 # CONFIG_GENERIC_TIME_VSYSCALL is not set
 # CONFIG_HANGCHECK_TIMER is not set
 CONFIG_HAS_DMA=y
 # CONFIG_GENERIC_TIME_VSYSCALL is not set
 # CONFIG_HANGCHECK_TIMER is not set
 CONFIG_HAS_DMA=y


@@ -159,29 +138,10 @@ CONFIG_HAVE_KRETPROBES=y
 CONFIG_HAVE_KVM=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
 CONFIG_HAVE_OPROFILE=y
 CONFIG_HAVE_KVM=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
 CONFIG_HAVE_OPROFILE=y

-CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set

 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
 CONFIG_HID=y
 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
 CONFIG_HID=y

-CONFIG_HID_A4TECH=m
-CONFIG_HID_APPLE=m
-CONFIG_HID_BELKIN=m
-CONFIG_HID_BRIGHT=m
-CONFIG_HID_CHERRY=m
-CONFIG_HID_CHICONY=m

 CONFIG_HID_COMPAT=y
 CONFIG_HID_COMPAT=y

-CONFIG_HID_CYPRESS=m
-CONFIG_HID_DELL=m
-CONFIG_HID_EZKEY=m
-CONFIG_HID_GYRATION=m
-CONFIG_HID_LOGITECH=m
-CONFIG_HID_MICROSOFT=m
-CONFIG_HID_MONTEREY=m
-CONFIG_HID_PANTHERLORD=m
-CONFIG_HID_PETALYNX=m
-# CONFIG_HID_PID is not set
-CONFIG_HID_SAMSUNG=m
-CONFIG_HID_SONY=m
-CONFIG_HID_SUNPLUS=m

 CONFIG_HID_SUPPORT=y
 # CONFIG_HIGHMEM4G is not set
 # CONFIG_HIGHMEM64G is not set
 CONFIG_HID_SUPPORT=y
 # CONFIG_HIGHMEM4G is not set
 # CONFIG_HIGHMEM64G is not set


@@ -190,28 +150,18 @@ CONFIG_HID_SUPPORT=y
 # CONFIG_HP_WATCHDOG is not set
 CONFIG_HT_IRQ=y
 # CONFIG_HUGETLBFS is not set
 # CONFIG_HP_WATCHDOG 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_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_I2C is not set

 # CONFIG_I6300ESB_WDT 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
 # CONFIG_IBM_ASM 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_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
-# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
-# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set

 CONFIG_IDE=y
 CONFIG_IDEPCI_PCIBUS_ORDER=y
 CONFIG_IDE_GD=y
 CONFIG_IDE=y
 CONFIG_IDEPCI_PCIBUS_ORDER=y
 CONFIG_IDE_GD=y


@@ -222,7 +172,6 @@ CONFIG_IDE_GENERIC=y
 CONFIG_IDE_TIMINGS=y
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INPUT=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
 CONFIG_INPUT_KEYBOARD=y
 CONFIG_INPUT_MOUSE=y
 CONFIG_INPUT_MOUSEDEV=y


@@ -253,15 +202,9 @@ CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_STOWAWAY is not set
 # CONFIG_KEYBOARD_SUNKBD is not set
 # CONFIG_KEYBOARD_XTKBD is not set
 # CONFIG_KEYBOARD_STOWAWAY is not set
 # CONFIG_KEYBOARD_SUNKBD is not set
 # CONFIG_KEYBOARD_XTKBD is not set

-CONFIG_KMOD=y

 CONFIG_KTIME_SCALAR=y
 # CONFIG_LANCE is not set
 # CONFIG_LEDS_CLEVO_MAIL is not set
 CONFIG_KTIME_SCALAR=y
 # CONFIG_LANCE is not set
 # CONFIG_LEDS_CLEVO_MAIL is not set

-CONFIG_LEDS_NET48XX=m
-# CONFIG_LEDS_WRAP is not set
-CONFIG_LOCK_KERNEL=y
-# 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
 CONFIG_M386=y
 # CONFIG_M486 is not set
 # CONFIG_M586 is not set


@@ -276,19 +219,8 @@ CONFIG_MATH_EMULATION=y
 # CONFIG_MCRUSOE is not set
 # CONFIG_MCYRIXIII is not set
 # CONFIG_MDA_CONSOLE is not set
 # CONFIG_MCRUSOE is not set
 # CONFIG_MCYRIXIII is not set
 # CONFIG_MDA_CONSOLE is not set

-CONFIG_MEDIA_TUNER=m
-CONFIG_MEDIA_TUNER_MT20XX=m
-CONFIG_MEDIA_TUNER_SIMPLE=m
-CONFIG_MEDIA_TUNER_TDA8290=m
-CONFIG_MEDIA_TUNER_TDA9887=m
-CONFIG_MEDIA_TUNER_TEA5761=m
-CONFIG_MEDIA_TUNER_TEA5767=m
-CONFIG_MEDIA_TUNER_XC2028=m
-CONFIG_MEDIA_TUNER_XC5000=m

 # CONFIG_MEFFICEON is not set
 # CONFIG_MEMTEST is not set
 # CONFIG_MEFFICEON is not set
 # CONFIG_MEMTEST is not set

-# CONFIG_MFD_CORE is not set
-# CONFIG_MFD_TMIO is not set

 # CONFIG_MGEODEGX1 is not set
 # CONFIG_MGEODE_LX is not set
 CONFIG_MICROCODE=y
 # CONFIG_MGEODEGX1 is not set
 # CONFIG_MGEODE_LX is not set
 CONFIG_MICROCODE=y


@@ -315,37 +247,9 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y
 # CONFIG_MPENTIUMIII is not set
 # CONFIG_MPENTIUMM is not set
 # CONFIG_MPSC is not set
 # CONFIG_MPENTIUMIII is not set
 # CONFIG_MPENTIUMM is not set
 # CONFIG_MPSC is not set

-CONFIG_MTD=y
-# CONFIG_MTD_ABSENT is not set
-CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK=y

 CONFIG_MTD_BLOCK2MTD=y
 # CONFIG_MTD_CFI is not set
 CONFIG_MTD_BLOCK2MTD=y
 # CONFIG_MTD_CFI is not set

-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-CONFIG_MTD_CHAR=y
-# CONFIG_MTD_CMDLINE_PARTS is not set

 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set

-# CONFIG_MTD_CONCAT is not set
-# CONFIG_MTD_JEDECPROBE is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_ONENAND is not set
-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
-# CONFIG_MTD_SLRAM is not set

 # CONFIG_MTD_TS5500 is not set
 CONFIG_MTRR=y
 # CONFIG_MTRR_SANITIZER is not set
 # CONFIG_MTD_TS5500 is not set
 CONFIG_MTRR=y
 # CONFIG_MTRR_SANITIZER is not set


@@ -354,27 +258,20 @@ CONFIG_MTRR=y
 # CONFIG_MWINCHIP3D is not set
 # CONFIG_MWINCHIPC6 is not set
 CONFIG_NAMESPACES=y
 # CONFIG_MWINCHIP3D is not set
 # CONFIG_MWINCHIPC6 is not set
 CONFIG_NAMESPACES=y

-CONFIG_NATSEMI=m
-CONFIG_NE2K_PCI=m
+# CONFIG_NATSEMI is not set

 CONFIG_NET_VENDOR_3COM=y
 # CONFIG_NET_VENDOR_RACAL is not set
 # CONFIG_NET_VENDOR_SMC 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=m

 CONFIG_NOHIGHMEM=y
 CONFIG_NOHIGHMEM=y

-CONFIG_NR_CPUS=8
-CONFIG_NSC_GPIO=m
+# CONFIG_NSC_GPIO is not set

 CONFIG_NVRAM=y
 # CONFIG_OLPC is not set
 # CONFIG_OPTIMIZE_INLINING is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_NVRAM=y
 # CONFIG_OLPC is not set
 # 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_PARAVIRT_GUEST is not set

-CONFIG_PC8736x_GPIO=m
+# CONFIG_PC8736x_GPIO is not set

 # CONFIG_PC87413_WDT is not set
 # CONFIG_PC87413_WDT is not set

-CONFIG_PCCARD=m
-CONFIG_PCCARD_NONSTATIC=m

 CONFIG_PCI=y
 # CONFIG_PCIEPORTBUS is not set
 CONFIG_PCI_BIOS=y
 CONFIG_PCI=y
 # CONFIG_PCIEPORTBUS is not set
 CONFIG_PCI_BIOS=y


@@ -385,16 +282,10 @@ CONFIG_PCI_GOANY=y
 # CONFIG_PCI_GODIRECT is not set
 # CONFIG_PCI_GOMMCONFIG is not set
 # CONFIG_PCI_GOOLPC is not set
 # CONFIG_PCI_GODIRECT is not set
 # CONFIG_PCI_GOMMCONFIG is not set
 # CONFIG_PCI_GOOLPC is not set

-CONFIG_PCMCIA=m
-CONFIG_PCMCIA_IOCTL=y
-CONFIG_PCMCIA_LOAD_CIS=y
-CONFIG_PCMCIA_PROBE=y
-CONFIG_PCNET32=m

 CONFIG_PCSPKR_PLATFORM=y
 # CONFIG_PCWATCHDOG is not set
 CONFIG_PHYSICAL_ALIGN=0x100000
 CONFIG_PHYSICAL_START=0x100000
 CONFIG_PCSPKR_PLATFORM=y
 # CONFIG_PCWATCHDOG is not set
 CONFIG_PHYSICAL_ALIGN=0x100000
 CONFIG_PHYSICAL_START=0x100000

-# CONFIG_PHYS_ADDR_T_64BIT is not set

 CONFIG_PNP=y
 # CONFIG_PNPACPI is not set
 # CONFIG_PNPBIOS is not set
 CONFIG_PNP=y
 # CONFIG_PNPACPI is not set
 # CONFIG_PNPBIOS is not set


@@ -403,31 +294,19 @@ CONFIG_PROC_PAGE_MONITOR=y
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
 # CONFIG_R6040 is not set
 # CONFIG_RELOCATABLE is not set
 # 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_RTC=y

-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set

 # CONFIG_SBC7240_WDT is not set
 # CONFIG_SBC8360_WDT is not set
 # CONFIG_SBC_EPX_C3_WATCHDOG is not set
 # CONFIG_SBC7240_WDT is not set
 # CONFIG_SBC8360_WDT is not set
 # CONFIG_SBC_EPX_C3_WATCHDOG is not set

-CONFIG_SC1200_WDT=m
+# CONFIG_SC1200_WDT is not set

 # CONFIG_SC520_WDT is not set
 # CONFIG_SC520_WDT is not set

-# CONFIG_SCC is not set

 # CONFIG_SCHED_HRTICK is not set
 # CONFIG_SCHED_HRTICK is not set

-CONFIG_SCHED_MC=y

 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y

-CONFIG_SCHED_SMT=y
-CONFIG_SCSI_WAIT_SCAN=m
+# CONFIG_SCSI_DMA is not set

 CONFIG_SCx200=y
 CONFIG_SCx200HR_TIMER=y
 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_SENSORS_PC87360=m
-# CONFIG_SERIAL_8250_CS is not set
+# CONFIG_SCx200_GPIO is not set
+# CONFIG_SCx200_WDT is not set

 # CONFIG_SERIAL_8250_EXTENDED is not set
 CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_8250_PNP=y
 # CONFIG_SERIAL_8250_EXTENDED is not set
 CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_8250_PNP=y


@@ -438,60 +317,38 @@ CONFIG_SERIO_LIBPS2=y
 # CONFIG_SERIO_PCIPS2 is not set
 # CONFIG_SERIO_RAW is not set
 CONFIG_SERIO_SERPORT=y
 # CONFIG_SERIO_PCIPS2 is not set
 # CONFIG_SERIO_RAW is not set
 CONFIG_SERIO_SERPORT=y

-CONFIG_SMP=y
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+CONFIG_SLUB_DEBUG=y
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+# CONFIG_SMP is not set

 # CONFIG_SMSC37B787_WDT 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=m

 # CONFIG_SONYPI is not set
 # CONFIG_SONYPI is not set

-CONFIG_SOUND_OSS_CORE=y

 CONFIG_SPARSEMEM_STATIC=y
 CONFIG_SPARSEMEM_STATIC=y

-CONFIG_SSB_POSSIBLE=y
-CONFIG_STOP_MACHINE=y

 CONFIG_STRICT_DEVMEM=y
 CONFIG_STRICT_DEVMEM=y

-# CONFIG_SUNRPC_REGISTER_V4 is not set

 # CONFIG_SYSPROF_TRACER is not set
 # CONFIG_SYSPROF_TRACER is not set

-CONFIG_SYSVIPC_SYSCTL=y
-# CONFIG_TCIC is not set

 # CONFIG_TELCLOCK is not set
 # CONFIG_TELCLOCK is not set

-# CONFIG_THRUSTMASTER_FF is not set

 # CONFIG_TOSHIBA is not set
 # CONFIG_TYPHOON is not set
 CONFIG_UID16=y
 # CONFIG_TOSHIBA is not set
 # CONFIG_TYPHOON is not set
 CONFIG_UID16=y

-CONFIG_USB=m
-CONFIG_USB_EHCI_HCD=m
-# CONFIG_USB_NET_DM9601 is not set
-# CONFIG_USB_NET_SMSC95XX 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_SERIAL_OTI6858 is not set

 CONFIG_USB_SUPPORT=y
 CONFIG_USB_SUPPORT=y

-CONFIG_USB_UHCI_HCD=m

 # CONFIG_USER_NS is not set
 # CONFIG_USER_NS is not set

-CONFIG_USE_GENERIC_SMP_HELPERS=y

 # CONFIG_VGACON_SOFT_SCROLLBACK is not set
 # CONFIG_VGASTATE is not set
 CONFIG_VGA_CONSOLE=y
 # 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_VIDEO_MEDIA=m
-CONFIG_VIDEO_V4L2=m
-CONFIG_VIDEO_V4L2_COMMON=m
+# CONFIG_VIA_RHINE is not set

 CONFIG_VM86=y
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_VM86=y
 CONFIG_VM_EVENT_COUNTERS=y

-CONFIG_VORTEX=m
+# CONFIG_VORTEX is not set

 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 # CONFIG_VT_HW_CONSOLE_BINDING is not set
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 # CONFIG_VT_HW_CONSOLE_BINDING is not set

-# CONFIG_W1_SLAVE_BQ27000 is not set

 # CONFIG_W83697UG_WDT is not set
 # CONFIG_WAFER_WDT is not set
 # CONFIG_WDT is not set
 CONFIG_X86=y
 CONFIG_X86_32=y
 # CONFIG_W83697UG_WDT is not set
 # CONFIG_WAFER_WDT is not set
 # CONFIG_WDT is not set
 CONFIG_X86=y
 CONFIG_X86_32=y

-CONFIG_X86_32_SMP=y

 # CONFIG_X86_64 is not set
 CONFIG_X86_BIOS_REBOOT=y
 # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
 # CONFIG_X86_64 is not set
 CONFIG_X86_BIOS_REBOOT=y
 # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set


@@ -505,8 +362,7 @@ CONFIG_X86_F00F_BUG=y
 CONFIG_X86_FIND_SMP_CONFIG=y
 CONFIG_X86_GENERIC=y
 # CONFIG_X86_GENERICARCH is not set
 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_GX_SUSPMOD is not set

 CONFIG_X86_INTEL_USERCOPY=y
 CONFIG_X86_IO_APIC=y
 CONFIG_X86_L1_CACHE_SHIFT=7
 CONFIG_X86_INTEL_USERCOPY=y
 CONFIG_X86_IO_APIC=y
 CONFIG_X86_L1_CACHE_SHIFT=7


@@ -529,19 +385,13 @@ CONFIG_X86_PPRO_FENCE=y
 # CONFIG_X86_RDC321X is not set
 # CONFIG_X86_REBOOTFIXUPS is not set
 CONFIG_X86_RESERVE_LOW_64K=y
 # CONFIG_X86_RDC321X is not set
 # CONFIG_X86_REBOOTFIXUPS is not set
 CONFIG_X86_RESERVE_LOW_64K=y

-CONFIG_X86_SMP=y

 # CONFIG_X86_SPEEDSTEP_CENTRINO is not set
 # CONFIG_X86_SPEEDSTEP_ICH is not set
 # CONFIG_X86_SPEEDSTEP_LIB is not set
 # CONFIG_X86_SPEEDSTEP_SMI is not set
 # CONFIG_X86_SPEEDSTEP_CENTRINO is not set
 # CONFIG_X86_SPEEDSTEP_ICH is not set
 # CONFIG_X86_SPEEDSTEP_LIB is not set
 # CONFIG_X86_SPEEDSTEP_SMI is not set

-CONFIG_X86_TRAMPOLINE=y
+CONFIG_X86_UP_APIC=y
+CONFIG_X86_UP_IOAPIC=y

 CONFIG_X86_VERBOSE_BOOTUP=y
 # CONFIG_X86_VOYAGER is not set
 # CONFIG_X86_VSMP is not set
 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_ZEROPLUS_FF is not set

 # CONFIG_ZONE_DMA32 is not set
 # CONFIG_ZONE_DMA32 is not set