[x86] create a config-3.2 for upcoming changes, rebase config-default to 2.6.39

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29953 3c298f89-4303-0410-b956-a3cf2f4a3e73

1 files changed, 54 insertions, 130 deletions

diff --git a/target/linux/x86/config-default b/target/linux/x86/config-default
index f30329acfa..5dd172bfd1 100644
--- a/target/linux/x86/config-default
+++ b/target/linux/x86/config-default
@@ -1,27 +1,23 @@
-# CONFIG_3C515 is not set
-CONFIG_4KSTACKS=y
 # CONFIG_60XX_WDT is not set
 # CONFIG_64BIT is not set
-# CONFIG_AC3200 is not set
-# CONFIG_ACERHDF is not set
 # CONFIG_ACPI is not set
-# CONFIG_ACPI_CMPC is not set
-# CONFIG_ACPI_EC_DEBUGFS is not set
-# CONFIG_ACPI_QUICKSTART is not set
 # CONFIG_ACQUIRE_WDT is not set
 # CONFIG_ADVANTECH_WDT is not set
 # CONFIG_ALIM1535_WDT is not set
-# CONFIG_APRICOT is not set
+# CONFIG_ALIX is not set
+CONFIG_AMD_NB=y
 CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
+# CONFIG_ARCH_DMA_ADDR_T_64BIT is not set
 CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
 CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
 CONFIG_ARCH_HAS_CPU_RELAX=y
 CONFIG_ARCH_HAS_DEFAULT_IDLE=y
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx"
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+CONFIG_ARCH_NO_SYSDEV_OPS=y
 # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
 CONFIG_ARCH_POPULATES_NODE_MAP=y
-# CONFIG_ARCH_RANDOM is not set
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -32,23 +28,16 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARCH_USES_PG_UNCACHED=y
 CONFIG_ARCH_WANT_FRAME_POINTERS=y
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
-# CONFIG_ASUS_LAPTOP is not set
-# CONFIG_AT1700 is not set
 CONFIG_ATA=y
 CONFIG_ATA_GENERIC=y
 CONFIG_ATA_PIIX=y
 # CONFIG_AUDIT_ARCH is not set
 CONFIG_BINFMT_MISC=y
-CONFIG_BITREVERSE=y
 CONFIG_BLK_DEV_SD=y
-# CONFIG_BLK_DEV_XD is not set
 CONFIG_BOUNCE=y
-# CONFIG_CC_STACKPROTECTOR is not set
-CONFIG_CFG80211_DEFAULT_PS_VALUE=0
 CONFIG_CLOCKSOURCE_WATCHDOG=y
-# CONFIG_CMDLINE_BOOL is not set
+CONFIG_CMPXCHG_LOCAL=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
@@ -67,74 +56,61 @@ CONFIG_CPU_FREQ_STAT_DETAILS=y
 CONFIG_CPU_FREQ_TABLE=y
 CONFIG_CPU_IDLE=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
-# CONFIG_CPU_SUP_AMD is not set
-# CONFIG_CPU_SUP_CENTAUR is not set
-# CONFIG_CPU_SUP_CYRIX_32 is not set
-# CONFIG_CPU_SUP_INTEL is not set
-# CONFIG_CPU_SUP_TRANSMETA_32 is not set
-# CONFIG_CPU_SUP_UMC_32 is not set
-# CONFIG_CRASHLOG is not set
+CONFIG_CPU_SUP_AMD=y
+CONFIG_CPU_SUP_CENTAUR=y
+CONFIG_CPU_SUP_CYRIX_32=y
+CONFIG_CPU_SUP_INTEL=y
+CONFIG_CPU_SUP_TRANSMETA_32=y
+CONFIG_CPU_SUP_UMC_32=y
+CONFIG_CRC16=y
 # CONFIG_CS5535_GPIO is not set
-# CONFIG_GPIO_CS5535 is not set
-# CONFIG_CS89x0 is not set
 # CONFIG_DCDBAS is not set
-# CONFIG_DEBUG_BOOT_PARAMS is not set
+CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_DEBUG_MEMORY_INIT=y
-# CONFIG_DEBUG_VIRTUAL is not set
 CONFIG_DECOMPRESS_BZIP2=y
 CONFIG_DECOMPRESS_GZIP=y
 CONFIG_DECOMPRESS_LZMA=y
 CONFIG_DEFAULT_IO_DELAY_TYPE=0
 # CONFIG_DELL_RBU is not set
-# CONFIG_DEPCA is not set
-CONFIG_DEVPORT=y
-# CONFIG_DMAR is not set
 # CONFIG_DMI is not set
-# CONFIG_DMI_SYSFS is not set
 CONFIG_DNOTIFY=y
 CONFIG_DOUBLEFAULT=y
-CONFIG_DUMMY_CONSOLE=y
 CONFIG_EARLY_PRINTK=y
 # CONFIG_EARLY_PRINTK_DBGP is not set
 # CONFIG_EDD is not set
-# CONFIG_EFI is not set
-# CONFIG_EISA is not set
-# CONFIG_EL1 is not set
-# CONFIG_EL16 is not set
-# CONFIG_EL2 is not set
-# CONFIG_EL3 is not set
 CONFIG_ELF_CORE=y
-# CONFIG_ELPLUS is not set
 # CONFIG_EUROTECH_WDT is not set
 CONFIG_EXT4_FS=y
+# CONFIG_F71808E_WDT is not set
 CONFIG_FIRMWARE_IN_KERNEL=y
 CONFIG_FIRMWARE_MEMMAP=y
 CONFIG_FIX_EARLYCON_MEM=y
 # CONFIG_FRAME_POINTER is not set
+CONFIG_FS_MBCACHE=y
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_GENERIC_CMOS_UPDATE=y
-# CONFIG_GENERIC_CPU is not set
 CONFIG_GENERIC_FIND_FIRST_BIT=y
 CONFIG_GENERIC_FIND_LAST_BIT=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
-CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
 CONFIG_GENERIC_IOMAP=y
+CONFIG_GENERIC_IRQ_SHOW=y
 CONFIG_GENERIC_ISA_DMA=y
 # CONFIG_GENERIC_TIME_VSYSCALL is not set
-# CONFIG_GOOGLE_FIRMWARE is not set
 # CONFIG_HANGCHECK_TIMER is not set
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAVE_AOUT=y
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
 CONFIG_HAVE_ARCH_KGDB=y
 CONFIG_HAVE_ARCH_KMEMCHECK=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
 CONFIG_HAVE_ATOMIC_IOMAP=y
 # CONFIG_HAVE_CPUMASK_OF_CPU_MAP is not set
+CONFIG_HAVE_C_RECORDMCOUNT=y
 CONFIG_HAVE_DMA_API_DEBUG=y
 CONFIG_HAVE_DMA_ATTRS=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
@@ -145,36 +121,39 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
 CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
 CONFIG_HAVE_GENERIC_DMA_COHERENT=y
+CONFIG_HAVE_GENERIC_HARDIRQS=y
+CONFIG_HAVE_HW_BREAKPOINT=y
 CONFIG_HAVE_IDE=y
 CONFIG_HAVE_IOREMAP_PROT=y
+CONFIG_HAVE_IRQ_WORK=y
 CONFIG_HAVE_KERNEL_BZIP2=y
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_LZMA=y
 CONFIG_HAVE_KERNEL_LZO=y
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_KERNEL_XZ=y
 CONFIG_HAVE_KVM=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
+CONFIG_HAVE_MEMBLOCK=y
+CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
 CONFIG_HAVE_MMIOTRACE_SUPPORT=y
 CONFIG_HAVE_OPROFILE=y
+CONFIG_HAVE_OPTPROBES=y
+CONFIG_HAVE_PERF_EVENTS=y
+CONFIG_HAVE_PERF_EVENTS_NMI=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+CONFIG_HAVE_SPARSE_IRQ=y
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_TEXT_POKE_SMP=y
 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
-# CONFIG_HIBERNATION is not set
-CONFIG_HID=y
-CONFIG_HID_SUPPORT=y
+CONFIG_HAVE_USER_RETURN_NOTIFIER=y
 # CONFIG_HIGHMEM4G is not set
-# CONFIG_HIGHMEM64G is not set
 # CONFIG_HIGH_RES_TIMERS is not set
-# CONFIG_HP_ACCEL is not set
-CONFIG_HPET=y
 CONFIG_HPET_EMULATE_RTC=y
-CONFIG_HPET_MMAP=y
 CONFIG_HPET_TIMER=y
 # CONFIG_HP_WATCHDOG is not set
 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
@@ -182,12 +161,10 @@ CONFIG_HW_RANDOM_VIA=y
 # CONFIG_I8K is not set
 # CONFIG_IB700_WDT is not set
 # CONFIG_IBMASR is not set
-# CONFIG_IMA is not set
+# CONFIG_IBM_RTL is not set
+CONFIG_ILLEGAL_POINTER_VALUE=0
 CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_INPUT is not set
-# CONFIG_INTEL_IPS is not set
-# CONFIG_INTEL_MEI is not set
-# CONFIG_INTEL_MENLOW is not set
+CONFIG_INSTRUCTION_DECODER=y
 # CONFIG_IOMMU_API is not set
 # CONFIG_IOMMU_HELPER is not set
 # CONFIG_IOMMU_STRESS is not set
@@ -199,27 +176,21 @@ 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_IRQ_FORCED_THREADING=y
+# CONFIG_IRQ_TIME_ACCOUNTING is not set
+CONFIG_IRQ_WORK=y
 # CONFIG_ISA is not set
+CONFIG_ISA_DMA_API=y
 # CONFIG_ISCSI_IBFT_FIND is not set
-# CONFIG_ISDN_CAPI is not set
-# CONFIG_ISDN_I4L is not set
 # CONFIG_IT8712F_WDT is not set
 # CONFIG_IT87_WDT is not set
 # CONFIG_ITCO_WDT is not set
+CONFIG_JBD2=y
 CONFIG_KALLSYMS=y
 CONFIG_KERNEL_GZIP=y
 # CONFIG_KERNEL_LZMA is not set
 CONFIG_KEXEC=y
-CONFIG_KEYBOARD_ATKBD=y
-# CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_NEWTON is not set
-# CONFIG_KEYBOARD_STOWAWAY is not set
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_XTKBD is not set
 CONFIG_KTIME_SCALAR=y
-# CONFIG_LANCE is not set
-# CONFIG_LEDS_ALIX2 is not set
-# CONFIG_LEDS_CLEVO_MAIL is not set
 # CONFIG_M386 is not set
 CONFIG_M486=y
 # CONFIG_M586 is not set
@@ -227,21 +198,18 @@ CONFIG_M486=y
 # CONFIG_M586TSC is not set
 # CONFIG_M686 is not set
 # CONFIG_MACHZ_WDT is not set
-CONFIG_X86_RESERVE_LOW=64
+CONFIG_MACH_NO_WESTBRIDGE=y
 CONFIG_MATH_EMULATION=y
 # CONFIG_MATOM is not set
 # CONFIG_MCA is not set
 # CONFIG_MCORE2 is not set
 # CONFIG_MCRUSOE is not set
 # CONFIG_MCYRIXIII is not set
-# CONFIG_MDA_CONSOLE is not set
 # CONFIG_MEFFICEON is not set
-# CONFIG_MELAN is not set
 # CONFIG_MEMTEST is not set
 # CONFIG_MGEODEGX1 is not set
 # CONFIG_MGEODE_LX is not set
 # CONFIG_MICROCODE is not set
-# CONFIG_MIXCOMWD is not set
 # CONFIG_MK6 is not set
 # CONFIG_MK7 is not set
 # CONFIG_MK8 is not set
@@ -249,7 +217,6 @@ CONFIG_MATH_EMULATION=y
 # CONFIG_MPENTIUMII is not set
 # CONFIG_MPENTIUMIII 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
@@ -261,25 +228,24 @@ CONFIG_MTRR=y
 # CONFIG_MWINCHIP3D is not set
 # CONFIG_MWINCHIPC6 is not set
 CONFIG_NAMESPACES=y
+# CONFIG_NEED_DMA_MAP_STATE is not set
 CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
+CONFIG_NEED_PER_CPU_KM=y
 CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
+CONFIG_NEED_SG_DMA_LENGTH=y
 # 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_NOHIGHMEM=y
+CONFIG_NO_BOOTMEM=y
 CONFIG_NR_CPUS=1
-# CONFIG_IRQ_TIME_ACCOUNTING is not set
 # CONFIG_NSC_GPIO is not set
 CONFIG_NVRAM=y
 # CONFIG_OLPC is not set
-# CONFIG_OLPC_OPENFIRMWARE is not set
 # CONFIG_OPTIMIZE_INLINING is not set
 CONFIG_OUTPUT_FORMAT="elf32-i386"
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xC0000000
 # CONFIG_PARAVIRT_GUEST is not set
-# CONFIG_PATA_AMD is not set
 CONFIG_PATA_MPIIX=y
 CONFIG_PATA_OLDPIIX=y
 CONFIG_PATA_SC1200=y
@@ -295,26 +261,19 @@ 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_MMCONFIG=y
 CONFIG_PCI_MSI=y
 CONFIG_PCSPKR_PLATFORM=y
-# CONFIG_PCWATCHDOG is not set
 # CONFIG_PDA_POWER is not set
+CONFIG_PERF_EVENTS=y
 CONFIG_PHYSICAL_ALIGN=0x100000
 CONFIG_PHYSICAL_START=0x1000000
-CONFIG_PM=y
-# CONFIG_PM_DEBUG is not set
-# CONFIG_PM_RUNTIME is not set
-CONFIG_PNP=y
-CONFIG_PNPACPI=y
-# CONFIG_PNPBIOS is not set
-CONFIG_PNP_DEBUG_MESSAGES=y
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
+# CONFIG_PREEMPT_RCU is not set
 # CONFIG_PROCESSOR_SELECT is not set
 CONFIG_PROC_PAGE_MONITOR=y
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
+# CONFIG_QUOTACTL is not set
 CONFIG_RD_BZIP2=y
 CONFIG_RD_GZIP=y
 # CONFIG_RELOCATABLE is not set
@@ -324,23 +283,15 @@ CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 # CONFIG_SBC7240_WDT is not set
 # CONFIG_SBC8360_WDT is not set
 # CONFIG_SBC_EPX_C3_WATCHDOG is not set
-# CONFIG_F71808E_WDT is not set
 # CONFIG_SC1200_WDT is not set
 # CONFIG_SC520_WDT is not set
 # CONFIG_SCHED_HRTICK is not set
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
 CONFIG_SCSI=y
-# CONFIG_SCSI_ISCI is not set
 CONFIG_SCx200=y
 CONFIG_SCx200HR_TIMER=y
 # CONFIG_SCx200_GPIO is not set
 # CONFIG_SCx200_WDT is not set
-# CONFIG_SENSORS_K10TEMP is not set
-# CONFIG_SENSORS_PKGTEMP is not set
-# CONFIG_SENSORS_VIA_CPUTEMP 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
@@ -348,58 +299,40 @@ CONFIG_SERIO_LIBPS2=y
 # CONFIG_SERIO_PCIPS2 is not set
 # CONFIG_SERIO_RAW is not set
 CONFIG_SERIO_SERPORT=y
-# CONFIG_SERIO_PS2MULT is not set
 # 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_SMSC37B787_WDT is not set
 # CONFIG_SMSC_SCH311X_WDT is not set
 CONFIG_SPARSEMEM_STATIC=y
-# CONFIG_SPARSE_IRQ is not set
 CONFIG_STRICT_DEVMEM=y
-# CONFIG_SUSPEND is not set
-# CONFIG_TC1100_WMI is not set
 # CONFIG_TELCLOCK is not set
 CONFIG_THERMAL=y
-# CONFIG_THINKPAD_ACPI is not set
-# CONFIG_TOPSTAR_LAPTOP is not set
 # CONFIG_TOSHIBA is not set
-# CONFIG_TOSHIBA_BT_RFKILL is not set
-# CONFIG_IBM_RTL is not set
-# CONFIG_TREE_PREEMPT_RCU is not set
-CONFIG_TREE_RCU=y
+# CONFIG_TRANSPARENT_HUGEPAGE is not set
 # CONFIG_TYPHOON is not set
 CONFIG_UID16=y
 CONFIG_USB_SUPPORT=y
 # CONFIG_USER_NS is not set
 CONFIG_USER_STACKTRACE_SUPPORT=y
-# CONFIG_VGACON_SOFT_SCROLLBACK is not set
-CONFIG_VGA_ARB_MAX_GPUS=16
-CONFIG_VGA_CONSOLE=y
-# CONFIG_VHOST_NET is not set
 CONFIG_VM86=y
 # CONFIG_VMWARE_BALLOON is not set
 # CONFIG_VMWARE_PVSCSI is not set
 CONFIG_VM_EVENT_COUNTERS=y
 # CONFIG_VORTEX is not set
-# CONFIG_VT 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_IRIS is not set
+CONFIG_X86_32_LAZY_GS=y
 # CONFIG_X86_64 is not set
-# CONFIG_X86_ACPI_CPUFREQ is not set
 CONFIG_X86_ALIGNMENT_16=y
 # 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_CPUFREQ_NFORCE2 is not set
 # CONFIG_X86_CPUID is not set
 # CONFIG_X86_EXTENDED_PLATFORM is not set
@@ -408,13 +341,12 @@ CONFIG_X86_F00F_BUG=y
 CONFIG_X86_GENERIC=y
 # CONFIG_X86_GX_SUSPMOD is not set
 CONFIG_X86_INTEL_USERCOPY=y
-CONFIG_X86_INTERNODE_CACHE_BYTES=64
+CONFIG_X86_INTERNODE_CACHE_SHIFT=6
+CONFIG_X86_INVD_BUG=y
 CONFIG_X86_INVLPG=y
 CONFIG_X86_IO_APIC=y
-CONFIG_X86_L1_CACHE_BYTES=64
 CONFIG_X86_L1_CACHE_SHIFT=6
 CONFIG_X86_LOCAL_APIC=y
-# CONFIG_X86_LONGHAUL is not set
 # CONFIG_X86_LONGRUN is not set
 CONFIG_X86_MCE=y
 CONFIG_X86_MCE_AMD=y
@@ -427,18 +359,14 @@ CONFIG_X86_MPPARSE=y
 # CONFIG_X86_P4_CLOCKMOD is not set
 # CONFIG_X86_PAE is not set
 CONFIG_X86_PAT=y
-# CONFIG_X86_PCC_CPUFREQ is not set
 CONFIG_X86_PLATFORM_DEVICES=y
-CONFIG_X86_PM_TIMER=y
 CONFIG_X86_POPAD_OK=y
 # CONFIG_X86_POWERNOW_K6 is not set
 # CONFIG_X86_POWERNOW_K7 is not set
-# CONFIG_X86_POWERNOW_K8 is not set
 CONFIG_X86_PPRO_FENCE=y
-# CONFIG_X86_PTDUMP is not set
 # CONFIG_X86_REBOOTFIXUPS is not set
 CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
-CONFIG_X86_RESERVE_LOW_64K=y
+CONFIG_X86_RESERVE_LOW=64
 # CONFIG_X86_SPEEDSTEP_CENTRINO is not set
 # CONFIG_X86_SPEEDSTEP_ICH is not set
 # CONFIG_X86_SPEEDSTEP_LIB is not set
@@ -450,9 +378,5 @@ CONFIG_X86_UP_IOAPIC=y
 CONFIG_X86_VERBOSE_BOOTUP=y
 CONFIG_X86_WP_WORKS_OK=y
 CONFIG_X86_XADD=y
-# CONFIG_XO15_EBOOK is not set
+CONFIG_XZ_DEC=y
 # CONFIG_ZONE_DMA32 is not set
-# CONFIG_BATTERY_BQ20Z75 is not set
-# CONFIG_TRANSPARENT_HUGEPAGE is not set
-# CONFIG_ALIX is not set
-# CONFIG_SAMSUNG_Q10 is not set