[brcm63xx] add support for 2.6.32, dropped the SPI patch for now

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

diff --git a/target/linux/x86/olpc/config-2.6.30 b/target/linux/x86/olpc/config-2.6.30
index f4f32e0..5926dbe 100644 (file)
--- 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_4KSTACKS=y
 # CONFIG_64BIT is not set

-CONFIG_ACPI=y

 CONFIG_ACPI_AC=y
 # CONFIG_ACPI_ASUS is not set
 CONFIG_ACPI_BATTERY=y
 CONFIG_ACPI_AC=y
 # CONFIG_ACPI_ASUS is not set
 CONFIG_ACPI_BATTERY=y


@@ -13,16 +12,16 @@ CONFIG_ACPI_BUTTON=y
 CONFIG_ACPI_FAN=y
 # CONFIG_ACPI_PCI_SLOT is not set
 CONFIG_ACPI_PROCESSOR=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_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_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_AGP is not set
+CONFIG_ACPI=y

 # CONFIG_APM is not set
 CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
 CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
 # CONFIG_APM is not set
 CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
 CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y


@@ -50,15 +49,14 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y
 # CONFIG_BACKLIGHT_PROGEAR is not set
 # CONFIG_BACKLIGHT_SAHARA is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_BACKLIGHT_PROGEAR is not set
 # CONFIG_BACKLIGHT_SAHARA is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set

-CONFIG_BASE_SMALL=0

 CONFIG_BATTERY_OLPC=y
 CONFIG_BINARY_PRINTF=y
 CONFIG_BINFMT_MISC=y
 CONFIG_BITREVERSE=y
 # CONFIG_BLK_DEV is not set
 CONFIG_BLK_DEV_SD=y
 CONFIG_BATTERY_OLPC=y
 CONFIG_BINARY_PRINTF=y
 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_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
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
 CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
 # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set


@@ -74,7 +72,6 @@ CONFIG_CLOCKSOURCE_WATCHDOG=y
 CONFIG_COMPAT_VDSO=y
 CONFIG_CONSOLE_TRANSLATIONS=y
 # CONFIG_CPA_DEBUG is not set
 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
 # 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 +83,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_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_DETAILS is not set

+CONFIG_CPU_FREQ_STAT=y

 CONFIG_CPU_FREQ_TABLE=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_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
 CONFIG_CPU_SUP_AMD=y
 # CONFIG_CPU_SUP_CENTAUR is not set
 # CONFIG_CPU_SUP_CYRIX_32 is not set


@@ -108,15 +106,14 @@ CONFIG_CRYPTO_WORKQUEUE=y
 # CONFIG_DCDBAS is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 # CONFIG_DEBUG_BOOT_PARAMS is not set
 # CONFIG_DCDBAS is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 # CONFIG_DEBUG_BOOT_PARAMS is not set

-# CONFIG_DEBUG_BUGVERBOSE is not set

 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_INFO is not set
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_KOBJECT is not set
 # CONFIG_DEBUG_LIST is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_INFO is not set
 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_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
 # CONFIG_DEBUG_MUTEXES is not set
 # CONFIG_DEBUG_NOTIFIERS is not set
 # CONFIG_DEBUG_NX_TEST is not set


@@ -142,13 +139,12 @@ CONFIG_DETECT_SOFTLOCKUP=y
 CONFIG_DEVPORT=y
 CONFIG_DISPLAY_SUPPORT=y
 # CONFIG_DMA_API_DEBUG is not set
 CONFIG_DEVPORT=y
 CONFIG_DISPLAY_SUPPORT=y
 # CONFIG_DMA_API_DEBUG is not set

-CONFIG_DMI=y

 CONFIG_DMIID=y
 CONFIG_DMIID=y

+CONFIG_DMI=y

 CONFIG_DOUBLEFAULT=y
 CONFIG_DUMMY_CONSOLE=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_EEEPC_LAPTOP is not set
 # CONFIG_EFI is not set
 # CONFIG_EDD is not set
 # CONFIG_EEEPC_LAPTOP is not set
 # CONFIG_EFI is not set


@@ -156,33 +152,33 @@ CONFIG_ELF_CORE=y
 CONFIG_EXT2_FS=y
 CONFIG_FAST_CMPXCHG_LOCAL=y
 # CONFIG_FAULT_INJECTION is not set
 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_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_GX1 is not set

+# CONFIG_FB_GEODE_GX is not set

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


@@ -210,8 +206,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


@@ -220,8 +216,8 @@ 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_LATENCYTOP_SUPPORT=y
 CONFIG_HAVE_MLOCK=y
 CONFIG_HAVE_MMIOTRACE_SUPPORT=y


@@ -229,37 +225,34 @@ CONFIG_HAVE_OPROFILE=y
 CONFIG_HAVE_SETUP_PER_CPU_AREA=y
 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
 CONFIG_HIBERNATION=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_SUPPORT=y

+CONFIG_HID=y

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

-# CONFIG_HPET is not set

 CONFIG_HPET_EMULATE_RTC=y
 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_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_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_I8K is not set
 # CONFIG_IMA is not set
 CONFIG_INITRAMFS_SOURCE=""
 # 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_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_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_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
 CONFIG_IO_DELAY_0X80=y
 # CONFIG_IO_DELAY_0XED is not set
 # CONFIG_IO_DELAY_NONE is not set


@@ -268,17 +261,17 @@ 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 is not set
+# CONFIG_IOMMU_API is not set
+# CONFIG_IOMMU_HELPER is not set

 CONFIG_ISA_DMA_API=y
 CONFIG_ISA_DMA_API=y

+# CONFIG_ISA is not set

 # CONFIG_ISCSI_IBFT_FIND 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_ALL is not set

-# CONFIG_KERNEL_BZIP2 is not set
+CONFIG_KALLSYMS=y

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

-CONFIG_KEXEC=y

 # CONFIG_KEXEC_JUMP is not set
 # 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
 CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_LKKBD is not set
 # CONFIG_KEYBOARD_NEWTON is not set


@@ -300,7 +293,6 @@ CONFIG_LCD_CLASS_DEVICE=y
 # CONFIG_M586MMX is not set
 # CONFIG_M586TSC is not set
 # CONFIG_M686 is not set
 # CONFIG_M586MMX is not set
 # CONFIG_M586TSC is not set
 # CONFIG_M686 is not set

-# CONFIG_MACINTOSH_DRIVERS is not set

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


@@ -316,12 +308,11 @@ CONFIG_MGEODE_LX=y
 # CONFIG_MK6 is not set
 # CONFIG_MK7 is not set
 # CONFIG_MK8 is not set
 # 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_BLOCK=y
 CONFIG_MMC_SDHCI=y

+CONFIG_MMC=y

 # CONFIG_MMIOTRACE is not set
 # CONFIG_MOUSE_BCM5974 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


@@ -330,11 +321,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_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_MSI_LAPTOP is not set
 # CONFIG_MPENTIUMM is not set
 # CONFIG_MPSC is not set
 # CONFIG_MSI_LAPTOP is not set


@@ -349,12 +341,12 @@ CONFIG_MTD_PCI=y
 # CONFIG_MWINCHIP3D is not set
 # CONFIG_MWINCHIPC6 is not set
 # CONFIG_NETDEV_1000 is not set
 # 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_NET_DROP_MONITOR is not set
 # CONFIG_NET_ETHERNET is not set

+# CONFIG_NETWORK_FILESYSTEMS is not set

 CONFIG_NOHIGHMEM=y
 CONFIG_NOHIGHMEM=y

-CONFIG_NOP_TRACER=y

 CONFIG_NO_HZ=y
 CONFIG_NO_HZ=y

+CONFIG_NOP_TRACER=y

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


@@ -367,11 +359,10 @@ CONFIG_PAGE_OFFSET=0xC0000000
 # CONFIG_PARAVIRT_GUEST is not set
 # CONFIG_PARTITION_ADVANCED is not set
 # CONFIG_PC8736x_GPIO is not set
 # 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_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_GOANY is not set
 # CONFIG_PCI_GOBIOS is not set
 # CONFIG_PCI_GODIRECT is not set


@@ -382,17 +373,17 @@ CONFIG_PCSPKR_PLATFORM=y
 # CONFIG_PDA_POWER is not set
 CONFIG_PHYSICAL_ALIGN=0x100000
 CONFIG_PHYSICAL_START=0x100000
 # 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_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_PNPACPI=y
 CONFIG_PNP_DEBUG_MESSAGES=y

-CONFIG_POWER_SUPPLY=y
+CONFIG_PNP=y

 # CONFIG_POWER_SUPPLY_DEBUG is not set
 # 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
 # CONFIG_POWER_TRACER is not set
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_VOLUNTARY=y


@@ -408,45 +399,42 @@ CONFIG_RTC=y
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_RWSEM_GENERIC_SPINLOCK is not set
 CONFIG_RWSEM_XCHGADD_ALGORITHM=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_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_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_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_SLOW_WORK is not set

-# CONFIG_SMP is not set

 # CONFIG_SONYPI 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_STACKTRACE=y
 CONFIG_STRICT_DEVMEM=y
 CONFIG_STACKTRACE=y
 CONFIG_STRICT_DEVMEM=y

-CONFIG_SUSPEND=y

 CONFIG_SUSPEND_FREEZER=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
 CONFIG_THERMAL=y
 # CONFIG_THINKPAD_ACPI is not set
 # CONFIG_SYSPROF_TRACER is not set
 # CONFIG_TC1100_WMI is not set
 # CONFIG_TELCLOCK is not set
 CONFIG_THERMAL=y
 # CONFIG_THINKPAD_ACPI is not set

-CONFIG_TICK_ONESHOT=y

 CONFIG_TIMER_STATS=y
 # CONFIG_TOSHIBA is not set
 CONFIG_TRACEPOINTS=y
 CONFIG_TIMER_STATS=y
 # CONFIG_TOSHIBA is not set
 CONFIG_TRACEPOINTS=y

-CONFIG_TRACING=y

 CONFIG_TRACING_SUPPORT=y
 CONFIG_TRACING_SUPPORT=y

+CONFIG_TRACING=y

 CONFIG_UID16=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
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set


@@ -456,35 +444,35 @@ CONFIG_USB_STORAGE=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_SUSPEND=y
 CONFIG_USB_UHCI_HCD=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_SUSPEND=y
 CONFIG_USB_UHCI_HCD=y

+CONFIG_USB=y

 CONFIG_USER_STACKTRACE_SUPPORT=y
 CONFIG_USER_STACKTRACE_SUPPORT=y

-CONFIG_VGACON_SOFT_SCROLLBACK=y

 CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
 CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64

+CONFIG_VGACON_SOFT_SCROLLBACK=y

 CONFIG_VGA_CONSOLE=y
 CONFIG_VM86=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_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_CONSOLE=y
 # CONFIG_VT_HW_CONSOLE_BINDING is not set

+CONFIG_VT=y

 # CONFIG_WATCHDOG is not set
 # CONFIG_WATCHDOG 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_ACPI_CPUFREQ is not set
 CONFIG_X86_BSWAP=y
 # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
 CONFIG_X86_CMPXCHG=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_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_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_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
 CONFIG_X86_GENERIC=y
 # CONFIG_X86_GX_SUSPMOD is not set
 CONFIG_X86_INTEL_USERCOPY=y


@@ -525,4 +513,5 @@ CONFIG_X86_USE_PPRO_CHECKSUM=y
 CONFIG_X86_VERBOSE_BOOTUP=y
 CONFIG_X86_WP_WORKS_OK=y
 CONFIG_X86_XADD=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
 # CONFIG_ZONE_DMA32 is not set