sort all target config files

SVN-Revision: 18367

5 files changed, 229 insertions, 229 deletions

diff --git a/target/linux/x86/config-2.6.28 b/target/linux/x86/config-2.6.28
index 6283ae09a0..d7a0a6de2d 100644
--- a/target/linux/x86/config-2.6.28
+++ b/target/linux/x86/config-2.6.28
@@ -36,9 +36,9 @@ 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_IDEDMA=y
 CONFIG_BLK_DEV_IDEDMA_PCI=y
 CONFIG_BLK_DEV_IDEDMA_SFF=y
+CONFIG_BLK_DEV_IDEDMA=y
 CONFIG_BLK_DEV_IDEPCI=y
 CONFIG_BLK_DEV_PIIX=y
 # CONFIG_BLK_DEV_QD65XX is not set
@@ -53,7 +53,6 @@ CONFIG_CLOCKSOURCE_WATCHDOG=y
 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
@@ -65,9 +64,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_STAT=y
 CONFIG_CPU_FREQ_STAT_DETAILS=y
+CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_FREQ_TABLE=y
+CONFIG_CPU_FREQ=y
 CONFIG_CPU_SUP_AMD=y
 CONFIG_CPU_SUP_CENTAUR_32=y
 CONFIG_CPU_SUP_CYRIX_32=y
@@ -83,18 +83,18 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
 # CONFIG_DELL_RBU is not set
 # CONFIG_DEPCA is not set
 CONFIG_DEVPORT=y
-CONFIG_DMI=y
 # CONFIG_DMIID is not set
+CONFIG_DMI=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=y
 # CONFIG_EDAC is not set
 # CONFIG_EDD is not set
 # CONFIG_EISA is not set
-# CONFIG_EL1 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
@@ -107,9 +107,9 @@ CONFIG_FIRMWARE_IN_KERNEL=y
 CONFIG_FIRMWARE_MEMMAP=y
 CONFIG_FIX_EARLYCON_MEM=y
 CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_CLOCKEVENTS=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
@@ -140,9 +140,9 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
 CONFIG_HAVE_OPROFILE=y
 # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
-CONFIG_HID=y
 CONFIG_HID_COMPAT=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
@@ -151,34 +151,33 @@ CONFIG_HID_SUPPORT=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=y
 # CONFIG_I2C 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_IDE=y
-CONFIG_IDEPCI_PCIBUS_ORDER=y
-CONFIG_IDE_GD=y
-CONFIG_IDE_GD_ATA=y
+# CONFIG_IBMASR is not set
 # CONFIG_IDE_GD_ATAPI is not set
+CONFIG_IDE_GD_ATA=y
+CONFIG_IDE_GD=y
 CONFIG_IDE_GENERIC=y
+CONFIG_IDEPCI_PCIBUS_ORDER=y
 # CONFIG_IDE_PROC_FS is not set
 CONFIG_IDE_TIMINGS=y
+CONFIG_IDE=y
 CONFIG_INITRAMFS_SOURCE=""
-CONFIG_INPUT=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_IOMMU_HELPER is not set
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSE=y
+CONFIG_INPUT=y
 CONFIG_IO_DELAY_0X80=y
 # CONFIG_IO_DELAY_0XED is not set
 # CONFIG_IO_DELAY_NONE is not set
@@ -187,9 +186,10 @@ 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_ISA=y
-CONFIG_ISAPNP=y
+# CONFIG_IOMMU_HELPER is not set
 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
@@ -223,16 +223,15 @@ CONFIG_MATH_EMULATION=y
 # 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=y
 # CONFIG_MIXCOMWD is not set
 # CONFIG_MK6 is not set
 # CONFIG_MK7 is not set
 # CONFIG_MK8 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
@@ -240,19 +239,20 @@ 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=y
 # 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_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_MTRR=y
 # 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
@@ -272,24 +272,24 @@ CONFIG_PAGE_OFFSET=0xC0000000
 # CONFIG_PARAVIRT_GUEST is not set
 # 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_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=y
 CONFIG_PCSPKR_PLATFORM=y
 # CONFIG_PCWATCHDOG is not set
 CONFIG_PHYSICAL_ALIGN=0x100000
 CONFIG_PHYSICAL_START=0x100000
-CONFIG_PNP=y
 # CONFIG_PNPACPI is not set
 # CONFIG_PNPBIOS is not set
 CONFIG_PNP_DEBUG_MESSAGES=y
+CONFIG_PNP=y
 CONFIG_PROC_PAGE_MONITOR=y
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
 # CONFIG_R6040 is not set
@@ -303,25 +303,25 @@ CONFIG_RTC=y
 # CONFIG_SCHED_HRTICK is not set
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 # CONFIG_SCSI_DMA is not set
-CONFIG_SCx200=y
-CONFIG_SCx200HR_TIMER=y
 # CONFIG_SCx200_GPIO is not set
+CONFIG_SCx200HR_TIMER=y
 # 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_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=y
 # CONFIG_SLAB is not set
-CONFIG_SLUB=y
-CONFIG_SLUB_DEBUG=y
 # CONFIG_SLUB_DEBUG_ON is not set
+CONFIG_SLUB_DEBUG=y
 # CONFIG_SLUB_STATS is not set
+CONFIG_SLUB=y
 # CONFIG_SMP is not set
 # CONFIG_SMSC37B787_WDT is not set
 # CONFIG_SONYPI is not set
@@ -335,42 +335,41 @@ CONFIG_UID16=y
 CONFIG_USB_SUPPORT=y
 # CONFIG_USER_NS is not set
 # CONFIG_VGACON_SOFT_SCROLLBACK is not set
-# CONFIG_VGASTATE is not set
 CONFIG_VGA_CONSOLE=y
+# CONFIG_VGASTATE is not set
 # CONFIG_VIA_RHINE 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=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_64 is not set
 CONFIG_X86_BIOS_REBOOT=y
 # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
 # CONFIG_X86_CMPXCHG is not set
-CONFIG_X86_CPU=y
 # CONFIG_X86_CPUFREQ_NFORCE2 is not set
 # CONFIG_X86_CPUID is not set
+CONFIG_X86_CPU=y
 # CONFIG_X86_ELAN is not set
 # CONFIG_X86_E_POWERSAVER is not set
 CONFIG_X86_F00F_BUG=y
 CONFIG_X86_FIND_SMP_CONFIG=y
-CONFIG_X86_GENERIC=y
 # CONFIG_X86_GENERICARCH is not set
+CONFIG_X86_GENERIC=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_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=y
 CONFIG_X86_MINIMUM_CPU_FAMILY=3
 CONFIG_X86_MPPARSE=y
 # CONFIG_X86_MSR is not set
@@ -394,4 +393,5 @@ CONFIG_X86_UP_IOAPIC=y
 CONFIG_X86_VERBOSE_BOOTUP=y
 # CONFIG_X86_VOYAGER is not set
 # CONFIG_X86_VSMP is not set
+CONFIG_X86=y
 # CONFIG_ZONE_DMA32 is not set
diff --git a/target/linux/x86/config-2.6.30 b/target/linux/x86/config-2.6.30
index 6cc268590b..36da392edb 100644
--- a/target/linux/x86/config-2.6.30
+++ b/target/linux/x86/config-2.6.30
@@ -26,11 +26,11 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARCH_WANT_FRAME_POINTERS=y
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 # CONFIG_AT1700 is not set
-CONFIG_ATA=y
 CONFIG_ATA_GENERIC=y
 # CONFIG_ATA_NONSTANDARD is not set
 CONFIG_ATA_PIIX=y
 CONFIG_ATA_SFF=y
+CONFIG_ATA=y
 # CONFIG_AUDIT_ARCH is not set
 CONFIG_BASE_SMALL=0
 # CONFIG_BINARY_PRINTF is not set
@@ -45,7 +45,6 @@ CONFIG_CLOCKSOURCE_WATCHDOG=y
 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
@@ -57,9 +56,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_STAT=y
 CONFIG_CPU_FREQ_STAT_DETAILS=y
+CONFIG_CPU_FREQ_STAT=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
@@ -79,18 +79,18 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
 # CONFIG_DEPCA is not set
 CONFIG_DEVPORT=y
 # CONFIG_DMA_API_DEBUG is not set
-CONFIG_DMI=y
 # CONFIG_DMIID is not set
+CONFIG_DMI=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=y
 # CONFIG_EDAC is not set
 # CONFIG_EDD is not set
 # CONFIG_EISA is not set
-# CONFIG_EL1 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
@@ -105,9 +105,9 @@ CONFIG_FIX_EARLYCON_MEM=y
 # CONFIG_FRAME_POINTER is not set
 # 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=y
 CONFIG_GENERIC_CMOS_UPDATE=y
 # CONFIG_GENERIC_CPU is not set
 CONFIG_GENERIC_FIND_FIRST_BIT=y
@@ -133,8 +133,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_FUNCTION_TRACER=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
@@ -143,16 +143,16 @@ CONFIG_HAVE_KERNEL_GZIP=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=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=y
 # CONFIG_HIGHMEM4G is not set
 # CONFIG_HIGHMEM64G is not set
 # CONFIG_HIGH_RES_TIMERS is not set
@@ -161,28 +161,26 @@ CONFIG_HID_SUPPORT=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=y
 # CONFIG_I2C 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_IBMASR is not set
 CONFIG_INITRAMFS_SOURCE=""
-CONFIG_INPUT=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=y
+CONFIG_INPUT_MOUSE=y
+CONFIG_INPUT=y
 # 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
@@ -191,9 +189,11 @@ 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_ISA=y
-CONFIG_ISAPNP=y
+# CONFIG_IOMMU_API is not set
+# CONFIG_IOMMU_HELPER is not set
 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
@@ -231,17 +231,16 @@ CONFIG_MATH_EMULATION=y
 # 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=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_MOUSE_PS2=y
 CONFIG_MOUSE_PS2_ALPS=y
 # CONFIG_MOUSE_PS2_ELANTECH is not set
 CONFIG_MOUSE_PS2_LIFEBOOK=y
@@ -249,19 +248,20 @@ 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=y
 # 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_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_MTRR=y
 # 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
@@ -289,24 +289,24 @@ CONFIG_PATA_SC1200=y
 CONFIG_PATA_VIA=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_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=y
 CONFIG_PCSPKR_PLATFORM=y
 # CONFIG_PCWATCHDOG is not set
 CONFIG_PHYSICAL_ALIGN=0x100000
 CONFIG_PHYSICAL_START=0x100000
-CONFIG_PNP=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
@@ -322,34 +322,34 @@ CONFIG_RTC=y
 # CONFIG_SC520_WDT is not set
 # CONFIG_SCHED_HRTICK is not set
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
-CONFIG_SCSI=y
 # CONFIG_SCSI_LOWLEVEL is not set
-CONFIG_SCx200=y
-CONFIG_SCx200HR_TIMER=y
+CONFIG_SCSI=y
 # CONFIG_SCx200_GPIO is not set
+CONFIG_SCx200HR_TIMER=y
 # 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_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=y
 # 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=y
 # CONFIG_SLUB_STATS is not set
+CONFIG_SLUB=y
 # CONFIG_SMP 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_SPARSEMEM_STATIC=y
 CONFIG_STRICT_DEVMEM=y
 # CONFIG_SYSPROF_TRACER is not set
 # CONFIG_TELCLOCK is not set
@@ -365,25 +365,24 @@ CONFIG_VGA_CONSOLE=y
 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=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_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_CPU=y
+# CONFIG_X86_CPU_DEBUG 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_EXTENDED_PLATFORM=y
 # 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
@@ -394,9 +393,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_MCE=y
 # 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
@@ -418,4 +417,5 @@ CONFIG_X86_RESERVE_LOW_64K=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
diff --git a/target/linux/x86/config-2.6.31 b/target/linux/x86/config-2.6.31
index ce211009ed..31c89fd035 100644
--- a/target/linux/x86/config-2.6.31
+++ b/target/linux/x86/config-2.6.31
@@ -26,11 +26,11 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARCH_WANT_FRAME_POINTERS=y
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 # CONFIG_AT1700 is not set
-CONFIG_ATA=y
 CONFIG_ATA_GENERIC=y
 # CONFIG_ATA_NONSTANDARD is not set
 CONFIG_ATA_PIIX=y
 CONFIG_ATA_SFF=y
+CONFIG_ATA=y
 # CONFIG_AUDIT_ARCH is not set
 CONFIG_BASE_SMALL=0
 # CONFIG_BINARY_PRINTF is not set
@@ -46,7 +46,6 @@ CONFIG_COMPAT_VDSO=y
 CONFIG_CONSOLE_TRANSLATIONS=y
 CONFIG_CONSTRUCTORS=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
@@ -58,9 +57,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_STAT=y
 CONFIG_CPU_FREQ_STAT_DETAILS=y
+CONFIG_CPU_FREQ_STAT=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
@@ -80,18 +80,18 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
 # CONFIG_DEPCA is not set
 CONFIG_DEVPORT=y
 # CONFIG_DMA_API_DEBUG is not set
-CONFIG_DMI=y
 # CONFIG_DMIID is not set
+CONFIG_DMI=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=y
 # CONFIG_EDAC is not set
 # CONFIG_EDD is not set
 # CONFIG_EISA is not set
-# CONFIG_EL1 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
@@ -106,9 +106,9 @@ CONFIG_FIX_EARLYCON_MEM=y
 # CONFIG_FRAME_POINTER is not set
 CONFIG_FSNOTIFY=y
 CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_CLOCKEVENTS=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
@@ -137,8 +137,8 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_FTRACE_SYSCALLS=y
 CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACER=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
@@ -147,17 +147,17 @@ CONFIG_HAVE_KERNEL_GZIP=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=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-CONFIG_HAVE_MLOCK=y
 CONFIG_HAVE_MLOCKED_PAGE_BIT=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=y
 # CONFIG_HIGHMEM4G is not set
 # CONFIG_HIGHMEM64G is not set
 # CONFIG_HIGH_RES_TIMERS is not set
@@ -166,29 +166,26 @@ CONFIG_HID_SUPPORT=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=y
 # CONFIG_I2C 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_IBMASR is not set
 CONFIG_INITRAMFS_SOURCE=""
-CONFIG_INPUT=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=y
+CONFIG_INPUT_MOUSE=y
+CONFIG_INPUT=y
 # CONFIG_INPUT_YEALINK is not set
-# CONFIG_IOMMU_API is not set
-# CONFIG_IOMMU_HELPER is not set
-# CONFIG_IOMMU_STRESS is not set
 CONFIG_IO_DELAY_0X80=y
 # CONFIG_IO_DELAY_0XED is not set
 # CONFIG_IO_DELAY_NONE is not set
@@ -197,9 +194,12 @@ 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_ISA=y
-CONFIG_ISAPNP=y
+# CONFIG_IOMMU_API is not set
+# CONFIG_IOMMU_HELPER is not set
+# CONFIG_IOMMU_STRESS is not set
 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
@@ -238,16 +238,15 @@ CONFIG_MATH_EMULATION=y
 # 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=y
 # CONFIG_MIXCOMWD is not set
 # CONFIG_MK6 is not set
 # CONFIG_MK7 is not set
 # CONFIG_MK8 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
@@ -255,19 +254,20 @@ 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=y
 # 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_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_MTRR=y
 # 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
@@ -296,24 +296,24 @@ CONFIG_PATA_SC1200=y
 CONFIG_PATA_VIA=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_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=y
 CONFIG_PCSPKR_PLATFORM=y
 # CONFIG_PCWATCHDOG is not set
 CONFIG_PHYSICAL_ALIGN=0x100000
 CONFIG_PHYSICAL_START=0x1000000
-CONFIG_PNP=y
 # CONFIG_PNPACPI is not set
 # CONFIG_PNPBIOS is not set
 CONFIG_PNP_DEBUG_MESSAGES=y
+CONFIG_PNP=y
 CONFIG_PROC_PAGE_MONITOR=y
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
 CONFIG_RD_BZIP2=y
@@ -328,34 +328,34 @@ CONFIG_RTC=y
 # CONFIG_SC520_WDT is not set
 # CONFIG_SCHED_HRTICK is not set
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
-CONFIG_SCSI=y
 # CONFIG_SCSI_LOWLEVEL is not set
-CONFIG_SCx200=y
-CONFIG_SCx200HR_TIMER=y
+CONFIG_SCSI=y
 # CONFIG_SCx200_GPIO is not set
+CONFIG_SCx200HR_TIMER=y
 # 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_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=y
 # 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=y
 # CONFIG_SLUB_STATS is not set
+CONFIG_SLUB=y
 # CONFIG_SMP 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_SPARSEMEM_STATIC=y
 CONFIG_STRICT_DEVMEM=y
 # CONFIG_TELCLOCK is not set
 # CONFIG_TOSHIBA is not set
@@ -370,26 +370,25 @@ CONFIG_VGA_CONSOLE=y
 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=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_LAZY_GS=y
+CONFIG_X86_32=y
 # CONFIG_X86_64 is not set
 # CONFIG_X86_ANCIENT_MCE 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_CPU_DEBUG is not set
+CONFIG_X86_CPU=y
 # CONFIG_X86_ELAN is not set
-CONFIG_X86_EXTENDED_PLATFORM=y
 # 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
@@ -400,11 +399,11 @@ 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_MCE=y
 CONFIG_X86_MCE_AMD=y
 # CONFIG_X86_MCE_INJECT is not set
 CONFIG_X86_MCE_INTEL=y
 CONFIG_X86_MCE_THRESHOLD=y
+CONFIG_X86_MCE=y
 CONFIG_X86_MINIMUM_CPU_FAMILY=3
 CONFIG_X86_MPPARSE=y
 # CONFIG_X86_MSR is not set
@@ -429,4 +428,5 @@ CONFIG_X86_THERMAL_VECTOR=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
diff --git a/target/linux/x86/olpc/config-2.6.30 b/target/linux/x86/olpc/config-2.6.30
index f4f32e0a9a..dac5ea2c1d 100644
--- a/target/linux/x86/olpc/config-2.6.30
+++ b/target/linux/x86/olpc/config-2.6.30
@@ -1,6 +1,5 @@
 CONFIG_4KSTACKS=y
 # CONFIG_64BIT is not set
-CONFIG_ACPI=y
 CONFIG_ACPI_AC=y
 # CONFIG_ACPI_ASUS is not set
 CONFIG_ACPI_BATTERY=y
@@ -13,15 +12,16 @@ CONFIG_ACPI_BUTTON=y
 CONFIG_ACPI_FAN=y
 # CONFIG_ACPI_PCI_SLOT is not set
 CONFIG_ACPI_PROCESSOR=y
+CONFIG_ACPI_PROC_EVENT=y
 # CONFIG_ACPI_PROCFS is not set
 CONFIG_ACPI_PROCFS_POWER=y
-CONFIG_ACPI_PROC_EVENT=y
 # CONFIG_ACPI_SBS is not set
 CONFIG_ACPI_SLEEP=y
 CONFIG_ACPI_SYSFS_POWER=y
 CONFIG_ACPI_THERMAL=y
 # CONFIG_ACPI_TOSHIBA is not set
 # CONFIG_ACPI_WMI is not set
+CONFIG_ACPI=y
 # CONFIG_AGP is not set
 # CONFIG_APM is not set
 CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
@@ -57,8 +57,8 @@ CONFIG_BINFMT_MISC=y
 CONFIG_BITREVERSE=y
 # CONFIG_BLK_DEV is not set
 CONFIG_BLK_DEV_SD=y
-CONFIG_BLK_DEV_SR=y
 CONFIG_BLK_DEV_SR_VENDOR=y
+CONFIG_BLK_DEV_SR=y
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
 CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
 # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
@@ -74,7 +74,6 @@ CONFIG_CLOCKSOURCE_WATCHDOG=y
 CONFIG_COMPAT_VDSO=y
 CONFIG_CONSOLE_TRANSLATIONS=y
 # CONFIG_CPA_DEBUG 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
@@ -86,12 +85,13 @@ 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_STAT=y
 # CONFIG_CPU_FREQ_STAT_DETAILS is not set
+CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_FREQ_TABLE=y
-CONFIG_CPU_IDLE=y
+CONFIG_CPU_FREQ=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_IDLE_GOV_MENU=y
+CONFIG_CPU_IDLE=y
 CONFIG_CPU_SUP_AMD=y
 # CONFIG_CPU_SUP_CENTAUR is not set
 # CONFIG_CPU_SUP_CYRIX_32 is not set
@@ -115,8 +115,8 @@ CONFIG_CRYPTO_WORKQUEUE=y
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_KOBJECT is not set
 # CONFIG_DEBUG_LIST is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_DEBUG_MUTEXES is not set
 # CONFIG_DEBUG_NOTIFIERS is not set
 # CONFIG_DEBUG_NX_TEST is not set
@@ -142,12 +142,12 @@ CONFIG_DETECT_SOFTLOCKUP=y
 CONFIG_DEVPORT=y
 CONFIG_DISPLAY_SUPPORT=y
 # CONFIG_DMA_API_DEBUG is not set
-CONFIG_DMI=y
 CONFIG_DMIID=y
+CONFIG_DMI=y
 CONFIG_DOUBLEFAULT=y
 CONFIG_DUMMY_CONSOLE=y
-CONFIG_EARLY_PRINTK=y
 # CONFIG_EARLY_PRINTK_DBGP is not set
+CONFIG_EARLY_PRINTK=y
 # CONFIG_EDAC is not set
 # CONFIG_EDD is not set
 # CONFIG_EEEPC_LAPTOP is not set
@@ -156,33 +156,33 @@ CONFIG_ELF_CORE=y
 CONFIG_EXT2_FS=y
 CONFIG_FAST_CMPXCHG_LOCAL=y
 # CONFIG_FAULT_INJECTION is not set
-CONFIG_FB=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_IMAGEBLIT=y
-CONFIG_FB_GEODE=y
-# CONFIG_FB_GEODE_GX is not set
 # CONFIG_FB_GEODE_GX1 is not set
+# CONFIG_FB_GEODE_GX is not set
 CONFIG_FB_GEODE_LX=y
+CONFIG_FB_GEODE=y
+CONFIG_FB=y
 # CONFIG_FCOE_FNIC is not set
 # CONFIG_FIRMWARE_EDID is not set
 # CONFIG_FIRMWARE_MEMMAP is not set
 CONFIG_FIX_EARLYCON_MEM=y
-# CONFIG_FONTS is not set
 CONFIG_FONT_8x16=y
 CONFIG_FONT_8x8=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FONTS is not set
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
 # CONFIG_FRAME_POINTER is not set
 CONFIG_FREEZER=y
 # CONFIG_FTRACE_STARTUP_TEST is not set
 # CONFIG_FTRACE_SYSCALLS is not set
 # CONFIG_FUJITSU_LAPTOP is not set
 CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_CLOCKEVENTS=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
@@ -210,8 +210,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_FUNCTION_TRACER=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
@@ -220,8 +220,8 @@ CONFIG_HAVE_KERNEL_GZIP=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=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
 CONFIG_HAVE_MLOCK=y
 CONFIG_HAVE_MMIOTRACE_SUPPORT=y
@@ -229,37 +229,35 @@ CONFIG_HAVE_OPROFILE=y
 CONFIG_HAVE_SETUP_PER_CPU_AREA=y
 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
 CONFIG_HIBERNATION=y
-CONFIG_HID=y
 CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
 # CONFIG_HIGHMEM4G is not set
 # CONFIG_HIGHMEM64G is not set
-# CONFIG_HPET is not set
 CONFIG_HPET_EMULATE_RTC=y
+# CONFIG_HPET is not set
 CONFIG_HPET_TIMER=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=y
 # CONFIG_I2C is not set
 # CONFIG_I8K is not set
 # CONFIG_IMA is not set
 CONFIG_INITRAMFS_SOURCE=""
-CONFIG_INPUT=y
 CONFIG_INPUT_EVDEV=y
 CONFIG_INPUT_KEYBOARD=y
-CONFIG_INPUT_MOUSE=y
-CONFIG_INPUT_MOUSEDEV=y
 # CONFIG_INPUT_MOUSEDEV_PSAUX is not set
 CONFIG_INPUT_MOUSEDEV_SCREEN_X=1200
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=900
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSE=y
+CONFIG_INPUT=y
 # CONFIG_INPUT_YEALINK is not set
 # CONFIG_INTEL_MENLOW 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
@@ -268,17 +266,19 @@ 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_ISA is not set
+# CONFIG_IOMMU_API is not set
+# CONFIG_IOMMU_HELPER is not set
 CONFIG_ISA_DMA_API=y
+# CONFIG_ISA is not set
 # CONFIG_ISCSI_IBFT_FIND is not set
 # CONFIG_ISDN is not set
-CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL 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_KEXEC_JUMP is not set
+CONFIG_KEXEC=y
 CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_LKKBD is not set
 # CONFIG_KEYBOARD_NEWTON is not set
@@ -316,12 +316,11 @@ CONFIG_MGEODE_LX=y
 # CONFIG_MK6 is not set
 # CONFIG_MK7 is not set
 # CONFIG_MK8 is not set
-CONFIG_MMC=y
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_SDHCI=y
+CONFIG_MMC=y
 # 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
@@ -330,11 +329,12 @@ CONFIG_MOUSE_PS2_OLPC=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_MPENTIUMII is not set
 # CONFIG_MPENTIUMIII is not set
+# CONFIG_MPENTIUMII is not set
 # CONFIG_MPENTIUMM is not set
 # CONFIG_MPSC is not set
 # CONFIG_MSI_LAPTOP is not set
@@ -349,12 +349,12 @@ CONFIG_MTD_PCI=y
 # CONFIG_MWINCHIP3D is not set
 # CONFIG_MWINCHIPC6 is not set
 # CONFIG_NETDEV_1000 is not set
-# CONFIG_NETWORK_FILESYSTEMS is not set
 # CONFIG_NET_DROP_MONITOR is not set
 # CONFIG_NET_ETHERNET is not set
+# CONFIG_NETWORK_FILESYSTEMS is not set
 CONFIG_NOHIGHMEM=y
-CONFIG_NOP_TRACER=y
 CONFIG_NO_HZ=y
+CONFIG_NOP_TRACER=y
 CONFIG_NR_CPUS=1
 # CONFIG_NSC_GPIO is not set
 CONFIG_NVRAM=y
@@ -367,32 +367,32 @@ CONFIG_PAGE_OFFSET=0xC0000000
 # CONFIG_PARAVIRT_GUEST is not set
 # CONFIG_PARTITION_ADVANCED is not set
 # CONFIG_PC8736x_GPIO is not set
-CONFIG_PCI=y
-# CONFIG_PCIEPORTBUS is not set
 # CONFIG_PCI_DEBUG is not set
 CONFIG_PCI_DIRECT=y
 CONFIG_PCI_DOMAINS=y
+# CONFIG_PCIEPORTBUS is not set
 # CONFIG_PCI_GOANY is not set
 # CONFIG_PCI_GOBIOS is not set
 # CONFIG_PCI_GODIRECT is not set
 # CONFIG_PCI_GOMMCONFIG is not set
 CONFIG_PCI_GOOLPC=y
 CONFIG_PCI_OLPC=y
+CONFIG_PCI=y
 CONFIG_PCSPKR_PLATFORM=y
 # CONFIG_PDA_POWER is not set
 CONFIG_PHYSICAL_ALIGN=0x100000
 CONFIG_PHYSICAL_START=0x100000
-CONFIG_PM=y
 CONFIG_PM_DEBUG=y
 CONFIG_PM_SLEEP=y
 CONFIG_PM_STD_PARTITION=""
 # CONFIG_PM_TRACE_RTC is not set
 # CONFIG_PM_VERBOSE is not set
-CONFIG_PNP=y
+CONFIG_PM=y
 CONFIG_PNPACPI=y
 CONFIG_PNP_DEBUG_MESSAGES=y
-CONFIG_POWER_SUPPLY=y
+CONFIG_PNP=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_TRACER is not set
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_VOLUNTARY=y
@@ -408,32 +408,32 @@ CONFIG_RTC=y
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_RWSEM_GENERIC_SPINLOCK is not set
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_SCHEDSTATS=y
 CONFIG_SCHED_DEBUG=y
 CONFIG_SCHED_HRTICK=y
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
+CONFIG_SCHEDSTATS=y
 CONFIG_SCSI=y
 # CONFIG_SCx200 is not set
 # CONFIG_SDIO_UART 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_SERIO=y
 # CONFIG_SLOW_WORK is not set
 # CONFIG_SMP is not set
 # CONFIG_SONYPI is not set
-CONFIG_SPARSEMEM_STATIC=y
 # CONFIG_SPARSE_IRQ is not set
+CONFIG_SPARSEMEM_STATIC=y
 CONFIG_STACKTRACE=y
 CONFIG_STRICT_DEVMEM=y
-CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
+CONFIG_SUSPEND=y
 # CONFIG_SYSPROF_TRACER is not set
 # CONFIG_TC1100_WMI is not set
 # CONFIG_TELCLOCK is not set
@@ -443,10 +443,9 @@ CONFIG_TICK_ONESHOT=y
 CONFIG_TIMER_STATS=y
 # CONFIG_TOSHIBA is not set
 CONFIG_TRACEPOINTS=y
-CONFIG_TRACING=y
 CONFIG_TRACING_SUPPORT=y
+CONFIG_TRACING=y
 CONFIG_UID16=y
-CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
@@ -456,35 +455,35 @@ CONFIG_USB_STORAGE=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_SUSPEND=y
 CONFIG_USB_UHCI_HCD=y
+CONFIG_USB=y
 CONFIG_USER_STACKTRACE_SUPPORT=y
-CONFIG_VGACON_SOFT_SCROLLBACK=y
 CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
+CONFIG_VGACON_SOFT_SCROLLBACK=y
 CONFIG_VGA_CONSOLE=y
 CONFIG_VM86=y
+CONFIG_VM_EVENT_COUNTERS=y
 # CONFIG_VMSPLIT_2G_OPT is not set
 # CONFIG_VMSPLIT_3G_OPT is not set
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 # CONFIG_VT_HW_CONSOLE_BINDING is not set
+CONFIG_VT=y
 # CONFIG_WATCHDOG is not set
-CONFIG_X86=y
-CONFIG_X86_32=y
 CONFIG_X86_32_LAZY_GS=y
+CONFIG_X86_32=y
 # CONFIG_X86_64 is not set
 # CONFIG_X86_ACPI_CPUFREQ is not set
 CONFIG_X86_BSWAP=y
 # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
 CONFIG_X86_CMPXCHG=y
-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_CPU_DEBUG is not set
+CONFIG_X86_CPU=y
 CONFIG_X86_DEBUGCTLMSR=y
 # CONFIG_X86_DS is not set
 # CONFIG_X86_ELAN is not set
-CONFIG_X86_EXTENDED_PLATFORM=y
 # CONFIG_X86_E_POWERSAVER is not set
+CONFIG_X86_EXTENDED_PLATFORM=y
 CONFIG_X86_GENERIC=y
 # CONFIG_X86_GX_SUSPMOD is not set
 CONFIG_X86_INTEL_USERCOPY=y
@@ -525,4 +524,5 @@ CONFIG_X86_USE_PPRO_CHECKSUM=y
 CONFIG_X86_VERBOSE_BOOTUP=y
 CONFIG_X86_WP_WORKS_OK=y
 CONFIG_X86_XADD=y
+CONFIG_X86=y
 # CONFIG_ZONE_DMA32 is not set
diff --git a/target/linux/x86/olpc/config-2.6.31 b/target/linux/x86/olpc/config-2.6.31
index 54f037ae0d..1907d34695 100644
--- a/target/linux/x86/olpc/config-2.6.31
+++ b/target/linux/x86/olpc/config-2.6.31
@@ -1,6 +1,5 @@
 CONFIG_4KSTACKS=y
 # CONFIG_64BIT is not set
-CONFIG_ACPI=y
 CONFIG_ACPI_AC=y
 # CONFIG_ACPI_ASUS is not set
 CONFIG_ACPI_BATTERY=y
@@ -13,15 +12,16 @@ CONFIG_ACPI_BUTTON=y
 CONFIG_ACPI_FAN=y
 # CONFIG_ACPI_PCI_SLOT is not set
 CONFIG_ACPI_PROCESSOR=y
+CONFIG_ACPI_PROC_EVENT=y
 # CONFIG_ACPI_PROCFS is not set
 CONFIG_ACPI_PROCFS_POWER=y
-CONFIG_ACPI_PROC_EVENT=y
 # CONFIG_ACPI_SBS is not set
 CONFIG_ACPI_SLEEP=y
 CONFIG_ACPI_SYSFS_POWER=y
 CONFIG_ACPI_THERMAL=y
 # CONFIG_ACPI_TOSHIBA is not set
 # CONFIG_ACPI_WMI is not set
+CONFIG_ACPI=y
 # CONFIG_AGP is not set
 # CONFIG_APM is not set
 CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
@@ -42,10 +42,10 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARCH_WANT_FRAME_POINTERS=y
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 # CONFIG_ASUS_LAPTOP is not set
-CONFIG_ATA=y
 CONFIG_ATA_GENERIC=y
 # CONFIG_ATA_NONSTANDARD is not set
 CONFIG_ATA_PIIX=y
+CONFIG_ATA=y
 # CONFIG_AUDIT_ARCH is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_GENERIC=y
@@ -61,8 +61,8 @@ CONFIG_BINFMT_MISC=y
 CONFIG_BITREVERSE=y
 # CONFIG_BLK_DEV is not set
 CONFIG_BLK_DEV_SD=y
-CONFIG_BLK_DEV_SR=y
 CONFIG_BLK_DEV_SR_VENDOR=y
+CONFIG_BLK_DEV_SR=y
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
 CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
 # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
@@ -79,7 +79,6 @@ CONFIG_COMPAT_VDSO=y
 CONFIG_CONSOLE_TRANSLATIONS=y
 CONFIG_CONTEXT_SWITCH_TRACER=y
 # CONFIG_CPA_DEBUG 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
@@ -91,12 +90,13 @@ 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_STAT=y
 # CONFIG_CPU_FREQ_STAT_DETAILS is not set
+CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_FREQ_TABLE=y
-CONFIG_CPU_IDLE=y
+CONFIG_CPU_FREQ=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_IDLE_GOV_MENU=y
+CONFIG_CPU_IDLE=y
 CONFIG_CPU_SUP_AMD=y
 CONFIG_CPU_SUP_CENTAUR=y
 CONFIG_CPU_SUP_CYRIX_32=y
@@ -115,8 +115,8 @@ CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_KMEMLEAK is not set
 # CONFIG_DEBUG_KOBJECT is not set
 # CONFIG_DEBUG_LIST is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 CONFIG_DEBUG_MEMORY_INIT=y
 # CONFIG_DEBUG_MUTEXES is not set
 # CONFIG_DEBUG_NOTIFIERS is not set
@@ -144,13 +144,13 @@ CONFIG_DETECT_SOFTLOCKUP=y
 CONFIG_DEVPORT=y
 CONFIG_DISPLAY_SUPPORT=y
 # CONFIG_DMA_API_DEBUG is not set
-CONFIG_DMI=y
 CONFIG_DMIID=y
+CONFIG_DMI=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=y
 # CONFIG_EDAC is not set
 # CONFIG_EDD is not set
 # CONFIG_EFI is not set
@@ -161,36 +161,36 @@ CONFIG_EVENT_TRACING=y
 CONFIG_EXT2_FS=y
 CONFIG_FAST_CMPXCHG_LOCAL=y
 # CONFIG_FAULT_INJECTION is not set
-CONFIG_FB=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_IMAGEBLIT=y
-CONFIG_FB_GEODE=y
-# CONFIG_FB_GEODE_GX is not set
 # CONFIG_FB_GEODE_GX1 is not set
+# CONFIG_FB_GEODE_GX is not set
 CONFIG_FB_GEODE_LX=y
+CONFIG_FB_GEODE=y
 # CONFIG_FB_HGA is not set
 # CONFIG_FB_LE80578 is not set
 # CONFIG_FB_N411 is not set
 # CONFIG_FB_UDL is not set
 # CONFIG_FB_VESA is not set
+CONFIG_FB=y
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FIRMWARE_IN_KERNEL=y
 CONFIG_FIRMWARE_MEMMAP=y
 CONFIG_FIX_EARLYCON_MEM=y
-# CONFIG_FONTS is not set
 CONFIG_FONT_8x16=y
 CONFIG_FONT_8x8=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FONTS is not set
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
 # CONFIG_FRAME_POINTER is not set
 CONFIG_FREEZER=y
 # CONFIG_FUJITSU_LAPTOP is not set
 CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_CLOCKEVENTS=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
@@ -221,8 +221,8 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_FTRACE_SYSCALLS=y
 CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACER=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
@@ -231,47 +231,44 @@ CONFIG_HAVE_KERNEL_GZIP=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=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
 CONFIG_HAVE_MMIOTRACE_SUPPORT=y
 CONFIG_HAVE_OPROFILE=y
 CONFIG_HAVE_PERF_COUNTERS=y
 CONFIG_HAVE_SETUP_PER_CPU_AREA=y
 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
-CONFIG_HIBERNATION=y
 CONFIG_HIBERNATION_NVS=y
-CONFIG_HID=y
+CONFIG_HIBERNATION=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_HPET is not set
 CONFIG_HPET_EMULATE_RTC=y
+# CONFIG_HPET is not set
 CONFIG_HPET_TIMER=y
 CONFIG_HT_IRQ=y
 # CONFIG_HUGETLBFS is not set
 CONFIG_HW_CONSOLE=y
-CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_GEODE=y
 CONFIG_HW_RANDOM_VIA=y
+CONFIG_HW_RANDOM=y
 # CONFIG_I2C is not set
 # CONFIG_I8K is not set
 # CONFIG_IMA is not set
 CONFIG_INITRAMFS_SOURCE=""
-CONFIG_INPUT=y
 CONFIG_INPUT_EVDEV=y
 CONFIG_INPUT_KEYBOARD=y
-CONFIG_INPUT_MOUSE=y
-CONFIG_INPUT_MOUSEDEV=y
 # CONFIG_INPUT_MOUSEDEV_PSAUX is not set
 CONFIG_INPUT_MOUSEDEV_SCREEN_X=1200
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=900
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSE=y
+CONFIG_INPUT=y
 # CONFIG_INPUT_YEALINK is not set
 # CONFIG_INTEL_MENLOW is not set
-# CONFIG_IOMMU_API is not set
-# CONFIG_IOMMU_HELPER is not set
-# CONFIG_IOMMU_STRESS is not set
 CONFIG_IO_DELAY_0X80=y
 # CONFIG_IO_DELAY_0XED is not set
 # CONFIG_IO_DELAY_NONE is not set
@@ -280,17 +277,20 @@ 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_ISA is not set
+# CONFIG_IOMMU_API is not set
+# CONFIG_IOMMU_HELPER is not set
+# CONFIG_IOMMU_STRESS is not set
 CONFIG_ISA_DMA_API=y
+# CONFIG_ISA is not set
 # CONFIG_ISCSI_IBFT_FIND is not set
 # CONFIG_ISDN is not set
-CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL 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_KEXEC_JUMP is not set
+CONFIG_KEXEC=y
 CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_LKKBD is not set
 # CONFIG_KEYBOARD_NEWTON is not set
@@ -329,15 +329,14 @@ CONFIG_MGEODE_LX=y
 # CONFIG_MK6 is not set
 # CONFIG_MK7 is not set
 # CONFIG_MK8 is not set
-CONFIG_MMC=y
 CONFIG_MMC_BLOCK=y
-CONFIG_MMC_SDHCI=y
 # CONFIG_MMC_SDHCI_PCI is not set
 # CONFIG_MMC_SDHCI_PLTFM is not set
+CONFIG_MMC_SDHCI=y
 # CONFIG_MMC_TIFM_SD is not set
 # CONFIG_MMC_WBSD is not set
+CONFIG_MMC=y
 # 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
@@ -346,11 +345,12 @@ CONFIG_MOUSE_PS2_OLPC=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_MPENTIUMII is not set
 # CONFIG_MPENTIUMIII is not set
+# CONFIG_MPENTIUMII is not set
 # CONFIG_MPENTIUMM is not set
 # CONFIG_MPSC is not set
 # CONFIG_MSI_LAPTOP is not set
@@ -366,14 +366,14 @@ CONFIG_MTD_CMDLINE_PARTS=y
 # CONFIG_MWINCHIPC6 is not set
 CONFIG_NAMESPACES=y
 # CONFIG_NETDEV_1000 is not set
-# CONFIG_NETWORK_FILESYSTEMS is not set
 # CONFIG_NET_DROP_MONITOR is not set
 # CONFIG_NET_ETHERNET is not set
 # CONFIG_NET_NS is not set
+# CONFIG_NETWORK_FILESYSTEMS is not set
 CONFIG_NLS=y
 CONFIG_NOHIGHMEM=y
-CONFIG_NOP_TRACER=y
 CONFIG_NO_HZ=y
+CONFIG_NOP_TRACER=y
 CONFIG_NR_CPUS=1
 # CONFIG_NSC_GPIO is not set
 CONFIG_NVRAM=y
@@ -392,33 +392,33 @@ CONFIG_PATA_OLDPIIX=y
 CONFIG_PATA_SC1200=y
 CONFIG_PATA_VIA=y
 # CONFIG_PC8736x_GPIO is not set
-CONFIG_PCI=y
-# CONFIG_PCIEPORTBUS is not set
 # CONFIG_PCI_DEBUG is not set
 CONFIG_PCI_DIRECT=y
 CONFIG_PCI_DOMAINS=y
+# CONFIG_PCIEPORTBUS is not set
 # CONFIG_PCI_GOANY is not set
 # CONFIG_PCI_GOBIOS is not set
 # CONFIG_PCI_GODIRECT is not set
 # CONFIG_PCI_GOMMCONFIG is not set
 CONFIG_PCI_GOOLPC=y
 CONFIG_PCI_OLPC=y
+CONFIG_PCI=y
 CONFIG_PCSPKR_PLATFORM=y
 # CONFIG_PDA_POWER is not set
 CONFIG_PERF_COUNTERS=y
 CONFIG_PHYSICAL_ALIGN=0x100000
 CONFIG_PHYSICAL_START=0x1000000
-CONFIG_PM=y
 CONFIG_PM_DEBUG=y
 CONFIG_PM_SLEEP=y
 CONFIG_PM_STD_PARTITION=""
 # CONFIG_PM_TRACE_RTC is not set
 # CONFIG_PM_VERBOSE is not set
-CONFIG_PNP=y
+CONFIG_PM=y
 CONFIG_PNPACPI=y
 CONFIG_PNP_DEBUG_MESSAGES=y
-CONFIG_POWER_SUPPLY=y
+CONFIG_PNP=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_POWER_SUPPLY=y
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_PROC_PAGE_MONITOR=y
@@ -435,36 +435,36 @@ CONFIG_RTC=y
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_RWSEM_GENERIC_SPINLOCK is not set
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_SCHEDSTATS=y
 CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHED_HRTICK is not set
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
-CONFIG_SCSI=y
+CONFIG_SCHEDSTATS=y
 # CONFIG_SCSI_LOWLEVEL is not set
+CONFIG_SCSI=y
 # CONFIG_SCx200 is not set
 # CONFIG_SDIO_UART 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_SERIO=y
 # CONFIG_SLAB is not set
-CONFIG_SLUB=y
-CONFIG_SLUB_DEBUG=y
 # CONFIG_SLUB_DEBUG_ON is not set
+CONFIG_SLUB_DEBUG=y
 # CONFIG_SLUB_STATS is not set
+CONFIG_SLUB=y
 # CONFIG_SMP is not set
-CONFIG_SPARSEMEM_STATIC=y
 # CONFIG_SPARSE_IRQ is not set
+CONFIG_SPARSEMEM_STATIC=y
 CONFIG_STACKTRACE=y
 CONFIG_STRICT_DEVMEM=y
-CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
+CONFIG_SUSPEND=y
 # CONFIG_TC1100_WMI is not set
 # CONFIG_TELCLOCK is not set
 CONFIG_THERMAL=y
@@ -475,7 +475,6 @@ CONFIG_TIMER_STATS=y
 CONFIG_TRACEPOINTS=y
 CONFIG_TRACING=y
 CONFIG_UID16=y
-CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
@@ -485,35 +484,35 @@ CONFIG_USB_STORAGE=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_SUSPEND=y
 CONFIG_USB_UHCI_HCD=y
+CONFIG_USB=y
 # CONFIG_USER_NS is not set
 CONFIG_USER_STACKTRACE_SUPPORT=y
-CONFIG_VGACON_SOFT_SCROLLBACK=y
 CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
+CONFIG_VGACON_SOFT_SCROLLBACK=y
 CONFIG_VGA_CONSOLE=y
 CONFIG_VM86=y
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 # CONFIG_VT_HW_CONSOLE_BINDING is not set
+CONFIG_VT=y
 # CONFIG_WATCHDOG is not set
-CONFIG_X86=y
-CONFIG_X86_32=y
 CONFIG_X86_32_LAZY_GS=y
+CONFIG_X86_32=y
 # CONFIG_X86_64 is not set
 # CONFIG_X86_ACPI_CPUFREQ is not set
 # CONFIG_X86_ANCIENT_MCE is not set
 CONFIG_X86_BSWAP=y
 # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
 CONFIG_X86_CMPXCHG=y
-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_CPU_DEBUG is not set
+CONFIG_X86_CPU=y
 CONFIG_X86_DEBUGCTLMSR=y
 # CONFIG_X86_DS is not set
 # CONFIG_X86_ELAN is not set
-CONFIG_X86_EXTENDED_PLATFORM=y
 # CONFIG_X86_E_POWERSAVER is not set
+CONFIG_X86_EXTENDED_PLATFORM=y
 CONFIG_X86_GENERIC=y
 # CONFIG_X86_GX_SUSPMOD is not set
 CONFIG_X86_INTEL_USERCOPY=y
@@ -554,4 +553,5 @@ CONFIG_X86_USE_PPRO_CHECKSUM=y
 CONFIG_X86_VERBOSE_BOOTUP=y
 CONFIG_X86_WP_WORKS_OK=y
 CONFIG_X86_XADD=y
+CONFIG_X86=y
 # CONFIG_ZONE_DMA32 is not set