[x86] sysupgrade: Dump image to sda device instead of hda (patch by Acinonyx)

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

diff --git a/target/linux/x86/config-2.6.30 b/target/linux/x86/config-2.6.30
index 6bcd8e7..24fcb13 100644 (file)
--- a/target/linux/x86/config-2.6.30
+++ b/target/linux/x86/config-2.6.30
@@ -5,7 +5,6 @@ CONFIG_4KSTACKS=y
 # CONFIG_AC3200 is not set
 # CONFIG_ACQUIRE_WDT is not set
 # CONFIG_ADVANTECH_WDT 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_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"


@@ -26,28 +25,14 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARCH_WANT_FRAME_POINTERS=y
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 # CONFIG_AT1700 is not set
 CONFIG_ARCH_WANT_FRAME_POINTERS=y
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 # CONFIG_AT1700 is not set

+CONFIG_ATA_GENERIC=y
+CONFIG_ATA_PIIX=y
+CONFIG_ATA=y

 # CONFIG_AUDIT_ARCH is not set
 # CONFIG_AUDIT_ARCH is not set

-CONFIG_BASE_SMALL=0

 # CONFIG_BINARY_PRINTF is not set
 CONFIG_BINFMT_MISC=y
 CONFIG_BITREVERSE=y
 # CONFIG_BINARY_PRINTF is not set
 CONFIG_BINFMT_MISC=y
 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_CS5536 is not set
-# CONFIG_BLK_DEV_DTC2278 is not set
-CONFIG_BLK_DEV_GENERIC=y
-# CONFIG_BLK_DEV_HT6560B is not set
-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_IT8172 is not set
-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_SD=y

 # CONFIG_BLK_DEV_XD is not set
 CONFIG_BOUNCE=y
 # CONFIG_CC_STACKPROTECTOR is not set
 # CONFIG_BLK_DEV_XD is not set
 CONFIG_BOUNCE=y
 # CONFIG_CC_STACKPROTECTOR is not set


@@ -56,7 +41,6 @@ CONFIG_CLOCKSOURCE_WATCHDOG=y
 CONFIG_COMPAT_VDSO=y
 CONFIG_CONSOLE_TRANSLATIONS=y
 # CONFIG_CPU5_WDT is not set
 CONFIG_COMPAT_VDSO=y
 CONFIG_CONSOLE_TRANSLATIONS=y
 # CONFIG_CPU5_WDT is not set

-CONFIG_CPU_FREQ=y

 # CONFIG_CPU_FREQ_DEBUG is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
 # CONFIG_CPU_FREQ_DEBUG is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set


@@ -68,9 +52,10 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 # CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
 # CONFIG_CPU_FREQ_GOV_USERSPACE is not set
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 # CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
 # CONFIG_CPU_FREQ_GOV_USERSPACE is not set

-CONFIG_CPU_FREQ_STAT=y

 CONFIG_CPU_FREQ_STAT_DETAILS=y
 CONFIG_CPU_FREQ_STAT_DETAILS=y

+CONFIG_CPU_FREQ_STAT=y

 CONFIG_CPU_FREQ_TABLE=y
 CONFIG_CPU_FREQ_TABLE=y

+CONFIG_CPU_FREQ=y

 CONFIG_CPU_SUP_AMD=y
 CONFIG_CPU_SUP_CENTAUR=y
 CONFIG_CPU_SUP_CYRIX_32=y
 CONFIG_CPU_SUP_AMD=y
 CONFIG_CPU_SUP_CENTAUR=y
 CONFIG_CPU_SUP_CYRIX_32=y


@@ -90,18 +75,17 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
 # CONFIG_DEPCA is not set
 CONFIG_DEVPORT=y
 # CONFIG_DMA_API_DEBUG is not set
 # CONFIG_DEPCA is not set
 CONFIG_DEVPORT=y
 # CONFIG_DMA_API_DEBUG is not set

-CONFIG_DMI=y

 # CONFIG_DMIID is not set
 # CONFIG_DMIID is not set

+CONFIG_DMI=y

 CONFIG_DNOTIFY=y
 CONFIG_DOUBLEFAULT=y
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_DNOTIFY=y
 CONFIG_DOUBLEFAULT=y
 CONFIG_DUMMY_CONSOLE=y

-CONFIG_EARLY_PRINTK=y

 # CONFIG_EARLY_PRINTK_DBGP is not set
 # CONFIG_EARLY_PRINTK_DBGP is not set

-# CONFIG_EDAC is not set
+CONFIG_EARLY_PRINTK=y

 # CONFIG_EDD is not set
 # CONFIG_EISA is not set
 # CONFIG_EDD is not set
 # CONFIG_EISA is not set

-# CONFIG_EL1 is not set

 # CONFIG_EL16 is not set
 # CONFIG_EL16 is not set

+# CONFIG_EL1 is not set

 # CONFIG_EL2 is not set
 # CONFIG_EL3 is not set
 CONFIG_ELF_CORE=y
 # CONFIG_EL2 is not set
 # CONFIG_EL3 is not set
 CONFIG_ELF_CORE=y


@@ -114,12 +98,11 @@ CONFIG_FIRMWARE_IN_KERNEL=y
 CONFIG_FIRMWARE_MEMMAP=y
 CONFIG_FIX_EARLYCON_MEM=y
 # CONFIG_FRAME_POINTER is not set
 CONFIG_FIRMWARE_MEMMAP=y
 CONFIG_FIX_EARLYCON_MEM=y
 # CONFIG_FRAME_POINTER is not set

-# CONFIG_FREEZER is not set

 # CONFIG_FTRACE_SYSCALLS is not set
 CONFIG_GENERIC_BUG=y
 # CONFIG_FTRACE_SYSCALLS is not set
 CONFIG_GENERIC_BUG=y

-CONFIG_GENERIC_CLOCKEVENTS=y

 CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y

+CONFIG_GENERIC_CLOCKEVENTS=y

 CONFIG_GENERIC_CMOS_UPDATE=y
 # CONFIG_GENERIC_CPU is not set
 CONFIG_GENERIC_FIND_FIRST_BIT=y
 CONFIG_GENERIC_CMOS_UPDATE=y
 # CONFIG_GENERIC_CPU is not set
 CONFIG_GENERIC_FIND_FIRST_BIT=y


@@ -145,8 +128,8 @@ CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_FTRACE_SYSCALLS=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_FTRACE_SYSCALLS=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y

-CONFIG_HAVE_FUNCTION_TRACER=y

 CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
 CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y

+CONFIG_HAVE_FUNCTION_TRACER=y

 CONFIG_HAVE_GENERIC_DMA_COHERENT=y
 CONFIG_HAVE_IDE=y
 CONFIG_HAVE_IOREMAP_PROT=y
 CONFIG_HAVE_GENERIC_DMA_COHERENT=y
 CONFIG_HAVE_IDE=y
 CONFIG_HAVE_IOREMAP_PROT=y


@@ -155,16 +138,16 @@ CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_LZMA=y
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
 CONFIG_HAVE_KERNEL_LZMA=y
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y

-CONFIG_HAVE_KVM=y

 CONFIG_HAVE_KVM_IRQCHIP=y
 CONFIG_HAVE_KVM_IRQCHIP=y

+CONFIG_HAVE_KVM=y

 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
 CONFIG_HAVE_MLOCK=y
 CONFIG_HAVE_MMIOTRACE_SUPPORT=y
 CONFIG_HAVE_OPROFILE=y
 CONFIG_HAVE_SETUP_PER_CPU_AREA=y
 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
 CONFIG_HAVE_MLOCK=y
 CONFIG_HAVE_MMIOTRACE_SUPPORT=y
 CONFIG_HAVE_OPROFILE=y
 CONFIG_HAVE_SETUP_PER_CPU_AREA=y
 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y

-CONFIG_HID=y

 CONFIG_HID_SUPPORT=y
 CONFIG_HID_SUPPORT=y

+CONFIG_HID=y

 # CONFIG_HIGHMEM4G is not set
 # CONFIG_HIGHMEM64G is not set
 # CONFIG_HIGH_RES_TIMERS is not set
 # CONFIG_HIGHMEM4G is not set
 # CONFIG_HIGHMEM64G is not set
 # CONFIG_HIGH_RES_TIMERS is not set


@@ -173,37 +156,25 @@ CONFIG_HID_SUPPORT=y
 CONFIG_HT_IRQ=y
 # CONFIG_HUGETLBFS is not set
 CONFIG_HW_CONSOLE=y
 CONFIG_HT_IRQ=y
 # CONFIG_HUGETLBFS is not set
 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_RANDOM_AMD is not set
 CONFIG_HW_RANDOM_GEODE=y
 # CONFIG_HW_RANDOM_INTEL is not set
 CONFIG_HW_RANDOM_VIA=y

-# CONFIG_I2C is not set
+CONFIG_HW_RANDOM=y

 # CONFIG_I6300ESB_WDT is not set
 # CONFIG_I8K is not set
 # CONFIG_IB700_WDT is not set
 # CONFIG_I6300ESB_WDT 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_ASM is not set

-CONFIG_IDE=y
-CONFIG_IDEPCI_PCIBUS_ORDER=y
-CONFIG_IDE_GD=y
-CONFIG_IDE_GD_ATA=y
-# CONFIG_IDE_GD_ATAPI is not set
-CONFIG_IDE_GENERIC=y
-# CONFIG_IDE_PROC_FS is not set
-CONFIG_IDE_TIMINGS=y
-CONFIG_IDE_XFER_MODE=y
+# CONFIG_IBMASR is not set

 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INITRAMFS_SOURCE=""

-CONFIG_INPUT=y

 CONFIG_INPUT_KEYBOARD=y
 CONFIG_INPUT_KEYBOARD=y

-CONFIG_INPUT_MOUSE=y
-CONFIG_INPUT_MOUSEDEV=y

 CONFIG_INPUT_MOUSEDEV_PSAUX=y
 CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 CONFIG_INPUT_MOUSEDEV_PSAUX=y
 CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768

+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSE=y
+CONFIG_INPUT=y

 # CONFIG_INPUT_YEALINK is not set
 # CONFIG_INPUT_YEALINK is not set

-# CONFIG_IOMMU_API is not set
-# CONFIG_IOMMU_HELPER is not set

 CONFIG_IO_DELAY_0X80=y
 # CONFIG_IO_DELAY_0XED is not set
 # CONFIG_IO_DELAY_NONE is not set
 CONFIG_IO_DELAY_0X80=y
 # CONFIG_IO_DELAY_0XED is not set
 # CONFIG_IO_DELAY_NONE is not set


@@ -212,15 +183,16 @@ 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_IO_DELAY_TYPE_NONE=3
 CONFIG_IO_DELAY_TYPE_UDELAY=2
 # CONFIG_IO_DELAY_UDELAY is not set

-CONFIG_ISA=y
-CONFIG_ISAPNP=y
+# CONFIG_IOMMU_API is not set
+# CONFIG_IOMMU_HELPER is not set

 CONFIG_ISA_DMA_API=y
 CONFIG_ISA_DMA_API=y

+CONFIG_ISAPNP=y
+CONFIG_ISA=y

 # CONFIG_ISCSI_IBFT_FIND is not set
 # CONFIG_IT8712F_WDT is not set
 # CONFIG_IT87_WDT is not set
 # CONFIG_ITCO_WDT is not set
 CONFIG_KALLSYMS=y
 # CONFIG_ISCSI_IBFT_FIND is not set
 # CONFIG_IT8712F_WDT is not set
 # CONFIG_IT87_WDT is not set
 # CONFIG_ITCO_WDT is not set
 CONFIG_KALLSYMS=y

-# CONFIG_KERNEL_BZIP2 is not set

 CONFIG_KERNEL_GZIP=y
 # CONFIG_KERNEL_LZMA is not set
 CONFIG_KEXEC=y
 CONFIG_KERNEL_GZIP=y
 # CONFIG_KERNEL_LZMA is not set
 CONFIG_KEXEC=y


@@ -234,19 +206,13 @@ CONFIG_KTIME_SCALAR=y
 # CONFIG_LANCE is not set
 # CONFIG_LEDS_ALIX2 is not set
 # CONFIG_LEDS_CLEVO_MAIL is not set
 # CONFIG_LANCE is not set
 # CONFIG_LEDS_ALIX2 is not set
 # CONFIG_LEDS_CLEVO_MAIL is not set

-# CONFIG_LIB80211 is not set

 CONFIG_M386=y
 # CONFIG_M486 is not set
 # CONFIG_M586 is not set
 # CONFIG_M586MMX is not set
 # CONFIG_M586TSC is not set
 # CONFIG_M686 is not set
 CONFIG_M386=y
 # CONFIG_M486 is not set
 # CONFIG_M586 is not set
 # CONFIG_M586MMX is not set
 # CONFIG_M586TSC is not set
 # CONFIG_M686 is not set

-CONFIG_MAC80211_RC_DEFAULT="minstrel"
-CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
-# CONFIG_MAC80211_RC_DEFAULT_PID is not set
-CONFIG_MAC80211_RC_MINSTREL=y

 # CONFIG_MACHZ_WDT is not set
 # CONFIG_MACHZ_WDT is not set

-# CONFIG_MACINTOSH_DRIVERS is not set

 CONFIG_MATH_EMULATION=y
 # CONFIG_MCA is not set
 # CONFIG_MCORE2 is not set
 CONFIG_MATH_EMULATION=y
 # CONFIG_MCA is not set
 # CONFIG_MCORE2 is not set


@@ -257,17 +223,16 @@ CONFIG_MATH_EMULATION=y
 # CONFIG_MEMTEST is not set
 # CONFIG_MGEODEGX1 is not set
 # CONFIG_MGEODE_LX is not set
 # CONFIG_MEMTEST is not set
 # CONFIG_MGEODEGX1 is not set
 # CONFIG_MGEODE_LX is not set

-CONFIG_MICROCODE=y

 # CONFIG_MICROCODE_AMD is not set
 CONFIG_MICROCODE_INTEL=y
 CONFIG_MICROCODE_OLD_INTERFACE=y
 # CONFIG_MICROCODE_AMD is not set
 CONFIG_MICROCODE_INTEL=y
 CONFIG_MICROCODE_OLD_INTERFACE=y

+CONFIG_MICROCODE=y

 # CONFIG_MIXCOMWD is not set
 # CONFIG_MK6 is not set
 # CONFIG_MK7 is not set
 # CONFIG_MK8 is not set
 # CONFIG_MMIOTRACE is not set
 # CONFIG_MOUSE_BCM5974 is not set
 # CONFIG_MIXCOMWD is not set
 # CONFIG_MK6 is not set
 # CONFIG_MK7 is not set
 # CONFIG_MK8 is not set
 # CONFIG_MMIOTRACE is not set
 # CONFIG_MOUSE_BCM5974 is not set

-CONFIG_MOUSE_PS2=y

 CONFIG_MOUSE_PS2_ALPS=y
 # CONFIG_MOUSE_PS2_ELANTECH is not set
 CONFIG_MOUSE_PS2_LIFEBOOK=y
 CONFIG_MOUSE_PS2_ALPS=y
 # CONFIG_MOUSE_PS2_ELANTECH is not set
 CONFIG_MOUSE_PS2_LIFEBOOK=y


@@ -275,31 +240,29 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y
 CONFIG_MOUSE_PS2_SYNAPTICS=y
 # CONFIG_MOUSE_PS2_TOUCHKIT is not set
 CONFIG_MOUSE_PS2_TRACKPOINT=y
 CONFIG_MOUSE_PS2_SYNAPTICS=y
 # CONFIG_MOUSE_PS2_TOUCHKIT is not set
 CONFIG_MOUSE_PS2_TRACKPOINT=y

+CONFIG_MOUSE_PS2=y

 # CONFIG_MOUSE_SERIAL is not set
 # CONFIG_MOUSE_VSXXXAA is not set
 # CONFIG_MPENTIUM4 is not set
 # CONFIG_MOUSE_SERIAL is not set
 # CONFIG_MOUSE_VSXXXAA is not set
 # CONFIG_MPENTIUM4 is not set

-# CONFIG_MPENTIUMII is not set

 # CONFIG_MPENTIUMIII is not set
 # CONFIG_MPENTIUMIII is not set

+# CONFIG_MPENTIUMII is not set

 # CONFIG_MPENTIUMM is not set
 # CONFIG_MPSC is not set
 CONFIG_MTD_BLOCK2MTD=y
 # CONFIG_MTD_CFI is not set
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
 # CONFIG_MTD_TS5500 is not set
 # CONFIG_MPENTIUMM is not set
 # CONFIG_MPSC is not set
 CONFIG_MTD_BLOCK2MTD=y
 # CONFIG_MTD_CFI is not set
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
 # CONFIG_MTD_TS5500 is not set

-CONFIG_MTRR=y

 # CONFIG_MTRR_SANITIZER is not set
 # CONFIG_MTRR_SANITIZER is not set

+CONFIG_MTRR=y

 # CONFIG_MVIAC3_2 is not set
 # CONFIG_MVIAC7 is not set
 # CONFIG_MWINCHIP3D is not set
 # CONFIG_MWINCHIPC6 is not set
 CONFIG_NAMESPACES=y
 # CONFIG_MVIAC3_2 is not set
 # CONFIG_MVIAC7 is not set
 # CONFIG_MWINCHIP3D is not set
 # CONFIG_MWINCHIPC6 is not set
 CONFIG_NAMESPACES=y

-# CONFIG_NATSEMI is not set

 # CONFIG_NET_NS is not set
 CONFIG_NET_VENDOR_3COM=y
 # CONFIG_NET_VENDOR_RACAL is not set
 # CONFIG_NET_VENDOR_SMC is not set
 # CONFIG_NET_NS is not set
 CONFIG_NET_VENDOR_3COM=y
 # CONFIG_NET_VENDOR_RACAL is not set
 # CONFIG_NET_VENDOR_SMC is not set

-# CONFIG_NF_DEFRAG_IPV4 is not set
-CONFIG_NLATTR=y

 CONFIG_NOHIGHMEM=y
 CONFIG_NR_CPUS=1
 # CONFIG_NSC_GPIO is not set
 CONFIG_NOHIGHMEM=y
 CONFIG_NR_CPUS=1
 # CONFIG_NSC_GPIO is not set


@@ -309,28 +272,32 @@ CONFIG_NVRAM=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xC0000000
 # CONFIG_PARAVIRT_GUEST is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xC0000000
 # CONFIG_PARAVIRT_GUEST is not set

+CONFIG_PATA_AMD=y
+# CONFIG_PATA_CS5536 is not set
+CONFIG_PATA_MPIIX=y
+CONFIG_PATA_OLDPIIX=y
+CONFIG_PATA_SC1200=y
+CONFIG_PATA_VIA=y

 # CONFIG_PC8736x_GPIO is not set
 # CONFIG_PC87413_WDT is not set
 CONFIG_PCI=y
 # CONFIG_PC8736x_GPIO is not set
 # CONFIG_PC87413_WDT is not set
 CONFIG_PCI=y

-# CONFIG_PCIEPORTBUS is not set

 CONFIG_PCI_BIOS=y
 CONFIG_PCI_DIRECT=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PCI_BIOS=y
 CONFIG_PCI_DIRECT=y
 CONFIG_PCI_DOMAINS=y

+# CONFIG_PCIEPORTBUS is not set

 CONFIG_PCI_GOANY=y
 # CONFIG_PCI_GOBIOS is not set
 # CONFIG_PCI_GODIRECT is not set
 # CONFIG_PCI_GOMMCONFIG is not set
 # CONFIG_PCI_GOOLPC is not set
 CONFIG_PCI_GOANY=y
 # CONFIG_PCI_GOBIOS is not set
 # CONFIG_PCI_GODIRECT is not set
 # CONFIG_PCI_GOMMCONFIG is not set
 # CONFIG_PCI_GOOLPC is not set

-# CONFIG_PCI_STUB is not set

 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_DEBUG_MESSAGES=y
 # CONFIG_PNPACPI is not set
 # CONFIG_PNPBIOS is not set
 CONFIG_PNP_DEBUG_MESSAGES=y

+CONFIG_PNP=y

 # CONFIG_POWER_TRACER is not set
 CONFIG_PROC_PAGE_MONITOR=y
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
 # CONFIG_POWER_TRACER is not set
 CONFIG_PROC_PAGE_MONITOR=y
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set


@@ -346,33 +313,32 @@ CONFIG_RTC=y
 # CONFIG_SC520_WDT is not set
 # CONFIG_SCHED_HRTICK is not set
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 # CONFIG_SC520_WDT is not set
 # CONFIG_SCHED_HRTICK is not set
 CONFIG_SCHED_OMIT_FRAME_POINTER=y

-# CONFIG_SCSI_DMA is not set
-CONFIG_SCx200=y
-CONFIG_SCx200HR_TIMER=y
+CONFIG_SCSI=y

 # CONFIG_SCx200_GPIO is not set
 # CONFIG_SCx200_GPIO is not set

+CONFIG_SCx200HR_TIMER=y

 # CONFIG_SCx200_WDT is not set
 # CONFIG_SCx200_WDT is not set

+CONFIG_SCx200=y

 # 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

-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_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_SERIO=y

 # CONFIG_SLAB is not set
 # CONFIG_SLOW_WORK is not set
 # CONFIG_SLAB is not set
 # CONFIG_SLOW_WORK is not set

-CONFIG_SLUB=y
-CONFIG_SLUB_DEBUG=y

 # CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_SLUB_DEBUG_ON is not set

+CONFIG_SLUB_DEBUG=y

 # CONFIG_SLUB_STATS is not set
 # CONFIG_SLUB_STATS is not set

-# CONFIG_SMP is not set
+CONFIG_SLUB=y

 # CONFIG_SMSC37B787_WDT is not set
 # CONFIG_SMSC_SCH311X_WDT is not set
 # CONFIG_SONYPI is not set
 # CONFIG_SMSC37B787_WDT is not set
 # CONFIG_SMSC_SCH311X_WDT is not set
 # CONFIG_SONYPI is not set

-CONFIG_SPARSEMEM_STATIC=y

 # CONFIG_SPARSE_IRQ is not set
 # CONFIG_SPARSE_IRQ is not set

+CONFIG_SPARSEMEM_STATIC=y

 CONFIG_STRICT_DEVMEM=y
 # CONFIG_SYSPROF_TRACER is not set
 # CONFIG_TELCLOCK is not set
 CONFIG_STRICT_DEVMEM=y
 # CONFIG_SYSPROF_TRACER is not set
 # CONFIG_TELCLOCK is not set


@@ -388,25 +354,24 @@ CONFIG_VGA_CONSOLE=y
 CONFIG_VM86=y
 CONFIG_VM_EVENT_COUNTERS=y
 # CONFIG_VORTEX is not set
 CONFIG_VM86=y
 CONFIG_VM_EVENT_COUNTERS=y
 # CONFIG_VORTEX is not set

-CONFIG_VT=y

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

+CONFIG_VT=y

 # CONFIG_W83697UG_WDT is not set
 # CONFIG_WAFER_WDT is not set
 # CONFIG_WDT 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_X86_32_LAZY_GS=y
 CONFIG_X86_32_LAZY_GS=y

+CONFIG_X86_32=y

 # CONFIG_X86_64 is not set
 # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
 # CONFIG_X86_CMPXCHG is not set
 # CONFIG_X86_64 is not set
 # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
 # CONFIG_X86_CMPXCHG is not set

-CONFIG_X86_CPU=y
+# CONFIG_X86_CPU_DEBUG is not set

 # CONFIG_X86_CPUFREQ_NFORCE2 is not set
 # CONFIG_X86_CPUID is not set
 # CONFIG_X86_CPUFREQ_NFORCE2 is not set
 # CONFIG_X86_CPUID is not set

-# CONFIG_X86_CPU_DEBUG is not set
+CONFIG_X86_CPU=y

 # CONFIG_X86_ELAN is not set
 # CONFIG_X86_ELAN is not set

-CONFIG_X86_EXTENDED_PLATFORM=y

 # CONFIG_X86_E_POWERSAVER is not set
 # CONFIG_X86_E_POWERSAVER is not set

+CONFIG_X86_EXTENDED_PLATFORM=y

 CONFIG_X86_F00F_BUG=y
 CONFIG_X86_GENERIC=y
 # CONFIG_X86_GX_SUSPMOD is not set
 CONFIG_X86_F00F_BUG=y
 CONFIG_X86_GENERIC=y
 # CONFIG_X86_GX_SUSPMOD is not set


@@ -417,9 +382,9 @@ CONFIG_X86_L1_CACHE_BYTES=64
 CONFIG_X86_L1_CACHE_SHIFT=4
 CONFIG_X86_LOCAL_APIC=y
 # CONFIG_X86_LONGRUN is not set
 CONFIG_X86_L1_CACHE_SHIFT=4
 CONFIG_X86_LOCAL_APIC=y
 # CONFIG_X86_LONGRUN is not set

-CONFIG_X86_MCE=y

 # CONFIG_X86_MCE_NONFATAL is not set
 # CONFIG_X86_MCE_P4THERMAL is not set
 # CONFIG_X86_MCE_NONFATAL is not set
 # CONFIG_X86_MCE_P4THERMAL is not set

+CONFIG_X86_MCE=y

 CONFIG_X86_MINIMUM_CPU_FAMILY=3
 CONFIG_X86_MPPARSE=y
 # CONFIG_X86_MSR is not set
 CONFIG_X86_MINIMUM_CPU_FAMILY=3
 CONFIG_X86_MPPARSE=y
 # CONFIG_X86_MSR is not set


@@ -441,4 +406,5 @@ CONFIG_X86_RESERVE_LOW_64K=y
 CONFIG_X86_UP_APIC=y
 CONFIG_X86_UP_IOAPIC=y
 CONFIG_X86_VERBOSE_BOOTUP=y
 CONFIG_X86_UP_APIC=y
 CONFIG_X86_UP_IOAPIC=y
 CONFIG_X86_VERBOSE_BOOTUP=y

+CONFIG_X86=y

 # CONFIG_ZONE_DMA32 is not set
 # CONFIG_ZONE_DMA32 is not set