when changing the mac address of a bridge interface, keep member interface addresses...

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

diff --git a/target/linux/x86/config-default b/target/linux/x86/config-default
index 6e26adc..2ec49b3 100644 (file)
--- a/target/linux/x86/config-default
+++ b/target/linux/x86/config-default
@@ -3,32 +3,10 @@ CONFIG_4KSTACKS=y
 # CONFIG_60XX_WDT is not set
 # CONFIG_64BIT is not set
 # CONFIG_AC3200 is not set
 # CONFIG_60XX_WDT is not set
 # CONFIG_64BIT is not set
 # CONFIG_AC3200 is not set

-# CONFIG_ACPI_AC is not set
-# CONFIG_ACPI_ASUS is not set
-# CONFIG_ACPI_BATTERY is not set
-CONFIG_ACPI_BLACKLIST_YEAR=0
-# CONFIG_ACPI_BUTTON is not set
-# CONFIG_ACPI_CONTAINER is not set
-# CONFIG_ACPI_CUSTOM_DSDT is not set
-# CONFIG_ACPI_DEBUG is not set
-# CONFIG_ACPI_DOCK is not set
-# CONFIG_ACPI_FAN is not set
-# CONFIG_ACPI_PCI_SLOT is not set
-# CONFIG_ACPI_PROCESSOR_AGGREGATOR is not set
-CONFIG_ACPI_PROCESSOR=y
-# CONFIG_ACPI_PROC_EVENT is not set
-# CONFIG_ACPI_PROCFS is not set
-# CONFIG_ACPI_PROCFS_POWER is not set
-# CONFIG_ACPI_SBS is not set
-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_ACPI is not set

 # CONFIG_ACQUIRE_WDT is not set
 # CONFIG_ADVANTECH_WDT is not set
 # CONFIG_ALIM1535_WDT is not set
 # CONFIG_ACQUIRE_WDT is not set
 # CONFIG_ADVANTECH_WDT is not set
 # CONFIG_ALIM1535_WDT is not set

-# CONFIG_APM is not set

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


@@ -51,9 +29,9 @@ CONFIG_ARCH_WANT_FRAME_POINTERS=y
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 # CONFIG_ASUS_LAPTOP is not set
 # CONFIG_AT1700 is not set
 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_ATA_GENERIC=y
 CONFIG_ATA_PIIX=y

-CONFIG_ATA=y

 # CONFIG_AUDIT_ARCH is not set
 CONFIG_BINFMT_MISC=y
 CONFIG_BITREVERSE=y
 # CONFIG_AUDIT_ARCH is not set
 CONFIG_BINFMT_MISC=y
 CONFIG_BITREVERSE=y


@@ -67,6 +45,7 @@ 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


@@ -78,18 +57,17 @@ 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_DETAILS=y

 CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_FREQ_STAT=y

+CONFIG_CPU_FREQ_STAT_DETAILS=y

 CONFIG_CPU_FREQ_TABLE=y
 CONFIG_CPU_FREQ_TABLE=y

-CONFIG_CPU_FREQ=y
-CONFIG_CPU_IDLE_GOV_LADDER=y

 CONFIG_CPU_IDLE=y
 CONFIG_CPU_IDLE=y

-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_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_CS5535_GPIO is not set
 # CONFIG_CS89x0 is not set
 # CONFIG_DCDBAS is not set
 # CONFIG_CS5535_GPIO is not set
 # CONFIG_CS89x0 is not set
 # CONFIG_DCDBAS is not set


@@ -101,20 +79,18 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
 # CONFIG_DELL_RBU is not set
 # CONFIG_DEPCA is not set
 CONFIG_DEVPORT=y
 # CONFIG_DELL_RBU is not set
 # CONFIG_DEPCA is not set
 CONFIG_DEVPORT=y

-# CONFIG_DMA_API_DEBUG is not set

 # CONFIG_DMAR is not set
 # CONFIG_DMAR is not set

-# CONFIG_DMIID is not set
-CONFIG_DMI=y
+# CONFIG_DMI is not set

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

-# CONFIG_EARLY_PRINTK_DBGP is not set

 CONFIG_EARLY_PRINTK=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_EDD is not set
 # CONFIG_EFI is not set
 # CONFIG_EISA is not set

-# CONFIG_EL16 is not set

 # CONFIG_EL1 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_EL2 is not set
 # CONFIG_EL3 is not set
 CONFIG_ELF_CORE=y


@@ -125,11 +101,10 @@ 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

 CONFIG_GENERIC_BUG=y
 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


@@ -138,7 +113,6 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
 CONFIG_GENERIC_IOMAP=y
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
 CONFIG_GENERIC_IOMAP=y
 CONFIG_GENERIC_ISA_DMA=y

-# CONFIG_GENERIC_PENDING_IRQ is not set

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


@@ -157,8 +131,8 @@ CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y

-CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y

 CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_HAVE_FUNCTION_TRACER=y

+CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=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


@@ -172,46 +146,37 @@ CONFIG_HAVE_KVM=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
 CONFIG_HAVE_MMIOTRACE_SUPPORT=y
 CONFIG_HAVE_OPROFILE=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
 CONFIG_HAVE_MMIOTRACE_SUPPORT=y
 CONFIG_HAVE_OPROFILE=y

-# CONFIG_HAVE_PERF_EVENTS is not set

 CONFIG_HAVE_SETUP_PER_CPU_AREA=y
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
 # CONFIG_HIBERNATION is not set
 CONFIG_HAVE_SETUP_PER_CPU_AREA=y
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
 # CONFIG_HIBERNATION is not set

-CONFIG_HID_SUPPORT=y

 CONFIG_HID=y
 CONFIG_HID=y

+CONFIG_HID_SUPPORT=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

-# CONFIG_HOTPLUG_CPU is not set
+CONFIG_HPET=y

 CONFIG_HPET_EMULATE_RTC=y
 CONFIG_HPET_MMAP=y
 CONFIG_HPET_TIMER=y
 CONFIG_HPET_EMULATE_RTC=y
 CONFIG_HPET_MMAP=y
 CONFIG_HPET_TIMER=y

-CONFIG_HPET=y

 # CONFIG_HP_WATCHDOG is not set
 CONFIG_HT_IRQ=y
 # CONFIG_HUGETLBFS is not set
 # CONFIG_HP_WATCHDOG is not set
 CONFIG_HT_IRQ=y
 # CONFIG_HUGETLBFS is not set

-# CONFIG_HVC_DRIVER is not set
-# CONFIG_HVC_IRQ is not set
-# CONFIG_HVC_XEN is not set

 CONFIG_HW_CONSOLE=y
 CONFIG_HW_CONSOLE=y

+CONFIG_HW_RANDOM=y

 CONFIG_HW_RANDOM_GEODE=y
 CONFIG_HW_RANDOM_VIA=y
 CONFIG_HW_RANDOM_GEODE=y
 CONFIG_HW_RANDOM_VIA=y

-CONFIG_HW_RANDOM=y

 # CONFIG_I6300ESB_WDT is not set
 # CONFIG_I8K is not set
 # CONFIG_IB700_WDT is not set
 # CONFIG_IBMASR is not set
 # CONFIG_IMA is not set
 CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_I6300ESB_WDT is not set
 # CONFIG_I8K is not set
 # CONFIG_IB700_WDT is not set
 # CONFIG_IBMASR is not set
 # CONFIG_IMA is not set
 CONFIG_INITRAMFS_SOURCE=""

-CONFIG_INPUT_KEYBOARD=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_INPUT is not set

 # CONFIG_INTEL_MENLOW 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
 CONFIG_IO_DELAY_0X80=y
 # CONFIG_IO_DELAY_0XED is not set
 # CONFIG_IO_DELAY_NONE is not set


@@ -220,13 +185,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_IO_DELAY_TYPE_NONE=3
 CONFIG_IO_DELAY_TYPE_UDELAY=2
 # CONFIG_IO_DELAY_UDELAY 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_ISAPNP=y
-CONFIG_ISA=y
+# CONFIG_ISA is not set

 # CONFIG_ISCSI_IBFT_FIND is not set
 # 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_IT8712F_WDT is not set
 # CONFIG_IT87_WDT is not set
 # CONFIG_ITCO_WDT is not set


@@ -241,15 +203,11 @@ CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_SUNKBD is not set
 # CONFIG_KEYBOARD_XTKBD is not set
 CONFIG_KTIME_SCALAR=y
 # CONFIG_KEYBOARD_SUNKBD is not set
 # CONFIG_KEYBOARD_XTKBD is not set
 CONFIG_KTIME_SCALAR=y

-# CONFIG_KVM_CLOCK is not set
-# CONFIG_KVM_GUEST is not set

 # 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_LGUEST_GUEST is not set
-# CONFIG_LOCK_KERNEL is not set

 # CONFIG_M386 is not set
 # CONFIG_M386 is not set

-# CONFIG_M486 is not set
+CONFIG_M486=y

 # CONFIG_M586 is not set
 # CONFIG_M586MMX is not set
 # CONFIG_M586TSC is not set
 # CONFIG_M586 is not set
 # CONFIG_M586MMX is not set
 # CONFIG_M586TSC is not set


@@ -266,36 +224,25 @@ 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_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_ALPS=y
-# CONFIG_MOUSE_PS2_ELANTECH is not set
-CONFIG_MOUSE_PS2_LIFEBOOK=y
-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_MPENTIUM4 is not set

-# CONFIG_MPENTIUMIII is not set

 # CONFIG_MPENTIUMII is not set
 # 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
 # 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_SANITIZER is not set

 CONFIG_MTRR=y
 CONFIG_MTRR=y

+# CONFIG_MTRR_SANITIZER is not set

 # CONFIG_MVIAC3_2 is not set
 # CONFIG_MVIAC7 is not set
 # CONFIG_MWINCHIP3D is not set
 # CONFIG_MVIAC3_2 is not set
 # CONFIG_MVIAC7 is not set
 # CONFIG_MWINCHIP3D is not set


@@ -307,9 +254,8 @@ CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
 CONFIG_NET_VENDOR_3COM=y
 # CONFIG_NET_VENDOR_RACAL is not set
 # CONFIG_NET_VENDOR_SMC is not set
 CONFIG_NET_VENDOR_3COM=y
 # CONFIG_NET_VENDOR_RACAL is not set
 # CONFIG_NET_VENDOR_SMC is not set

-CONFIG_NETWORK_FILESYSTEMS=y

 CONFIG_NOHIGHMEM=y
 CONFIG_NOHIGHMEM=y

-# CONFIG_NR_CPUS is not set
+CONFIG_NR_CPUS=1

 # CONFIG_NSC_GPIO is not set
 CONFIG_NVRAM=y
 # CONFIG_OLPC is not set
 # CONFIG_NSC_GPIO is not set
 CONFIG_NVRAM=y
 # CONFIG_OLPC is not set


@@ -317,10 +263,7 @@ CONFIG_NVRAM=y
 CONFIG_OUTPUT_FORMAT="elf32-i386"
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_OUTPUT_FORMAT="elf32-i386"
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xC0000000

-# CONFIG_PARAVIRT_CLOCK is not set

 # CONFIG_PARAVIRT_GUEST is not set
 # CONFIG_PARAVIRT_GUEST is not set

-# CONFIG_PARAVIRT is not set
-# CONFIG_PARAVIRT_SPINLOCKS is not set

 CONFIG_PATA_AMD=y
 CONFIG_PATA_MPIIX=y
 CONFIG_PATA_OLDPIIX=y
 CONFIG_PATA_AMD=y
 CONFIG_PATA_MPIIX=y
 CONFIG_PATA_OLDPIIX=y


@@ -328,10 +271,11 @@ CONFIG_PATA_SC1200=y
 CONFIG_PATA_VIA=y
 # CONFIG_PC8736x_GPIO is not set
 # CONFIG_PC87413_WDT is not set
 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_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_GOANY=y
 # CONFIG_PCI_GOBIOS is not set
 # CONFIG_PCI_GODIRECT is not set


@@ -342,28 +286,20 @@ CONFIG_PCI_MSI=y
 CONFIG_PCSPKR_PLATFORM=y
 # CONFIG_PCWATCHDOG is not set
 # CONFIG_PDA_POWER is not set
 CONFIG_PCSPKR_PLATFORM=y
 # CONFIG_PCWATCHDOG is not set
 # CONFIG_PDA_POWER is not set

-# CONFIG_PERF_COUNTERS is not set
-# CONFIG_PERF_EVENTS is not set
-# CONFIG_PHYS_ADDR_T_64BIT is not set

 CONFIG_PHYSICAL_ALIGN=0x100000
 CONFIG_PHYSICAL_START=0x1000000
 CONFIG_PHYSICAL_ALIGN=0x100000
 CONFIG_PHYSICAL_START=0x1000000

+CONFIG_PM=y

 # CONFIG_PM_DEBUG is not set
 # CONFIG_PM_RUNTIME is not set
 # CONFIG_PM_DEBUG is not set
 # CONFIG_PM_RUNTIME is not set

-# CONFIG_PM_SLEEP is not set
-# CONFIG_PM_SLEEP_SMP is not set
-CONFIG_PM=y
+CONFIG_PNP=y

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

-CONFIG_PNP=y
-# CONFIG_POWER_SUPPLY_DEBUG is not set

 CONFIG_POWER_SUPPLY=y
 CONFIG_POWER_SUPPLY=y

+# CONFIG_POWER_SUPPLY_DEBUG is not set

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

-CONFIG_RCU_FANOUT=32
-# CONFIG_RCU_FANOUT_EXACT is not set
-# CONFIG_RCU_TRACE is not set

 CONFIG_RD_BZIP2=y
 CONFIG_RD_GZIP=y
 # CONFIG_RELOCATABLE is not set
 CONFIG_RD_BZIP2=y
 CONFIG_RD_GZIP=y
 # CONFIG_RELOCATABLE is not set


@@ -376,39 +312,33 @@ CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 # CONFIG_SC1200_WDT is not set
 # CONFIG_SC520_WDT is not set
 # CONFIG_SCHED_HRTICK is not set
 # CONFIG_SC1200_WDT is not set
 # CONFIG_SC520_WDT is not set
 # CONFIG_SCHED_HRTICK is not set

-# CONFIG_SCHED_MC is not set

 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 CONFIG_SCHED_OMIT_FRAME_POINTER=y

-# CONFIG_SCHED_SMT is not set
-# CONFIG_SCSI_LOWLEVEL is not set

 CONFIG_SCSI=y
 CONFIG_SCSI=y

-# CONFIG_SCx200_GPIO is not set
+CONFIG_SCx200=y

 CONFIG_SCx200HR_TIMER=y
 CONFIG_SCx200HR_TIMER=y

+# CONFIG_SCx200_GPIO is not set

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

-# CONFIG_SLUB_DEBUG_ON is not set
+CONFIG_SLUB=y

 CONFIG_SLUB_DEBUG=y
 CONFIG_SLUB_DEBUG=y

+# CONFIG_SLUB_DEBUG_ON is not set

 # CONFIG_SLUB_STATS is not set
 # 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_SMSC37B787_WDT is not set
 # CONFIG_SMSC_SCH311X_WDT is not set

-# CONFIG_SPARSE_IRQ is not set

 CONFIG_SPARSEMEM_STATIC=y
 CONFIG_SPARSEMEM_STATIC=y

-# CONFIG_STOP_MACHINE is not set
+# CONFIG_SPARSE_IRQ is not set

 CONFIG_STRICT_DEVMEM=y
 # CONFIG_SUSPEND is not set
 CONFIG_STRICT_DEVMEM=y
 # CONFIG_SUSPEND is not set

-# CONFIG_SYS_HYPERVISOR is not set

 # CONFIG_TC1100_WMI is not set
 # CONFIG_TELCLOCK is not set
 CONFIG_THERMAL=y
 # CONFIG_TC1100_WMI is not set
 # CONFIG_TELCLOCK is not set
 CONFIG_THERMAL=y


@@ -420,65 +350,52 @@ CONFIG_TREE_RCU=y
 # CONFIG_TYPHOON is not set
 CONFIG_UID16=y
 CONFIG_USB_SUPPORT=y
 # CONFIG_TYPHOON is not set
 CONFIG_UID16=y
 CONFIG_USB_SUPPORT=y

-# CONFIG_USE_GENERIC_SMP_HELPERS is not set

 # CONFIG_USER_NS is not set
 CONFIG_USER_STACKTRACE_SUPPORT=y
 # CONFIG_VGACON_SOFT_SCROLLBACK is not set
 CONFIG_VGA_CONSOLE=y
 CONFIG_VM86=y
 CONFIG_VM_EVENT_COUNTERS=y
 # CONFIG_USER_NS is not set
 CONFIG_USER_STACKTRACE_SUPPORT=y
 # CONFIG_VGACON_SOFT_SCROLLBACK is not set
 CONFIG_VGA_CONSOLE=y
 CONFIG_VM86=y
 CONFIG_VM_EVENT_COUNTERS=y

-# CONFIG_VMI is not set

 # CONFIG_VORTEX is not set
 # CONFIG_VORTEX is not set

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

 # 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_32_LAZY_GS=y
-# CONFIG_X86_32_SMP is not set
+CONFIG_X86=y

 CONFIG_X86_32=y
 CONFIG_X86_32=y

+CONFIG_X86_32_LAZY_GS=y

 # CONFIG_X86_64 is not set
 # CONFIG_X86_ACPI_CPUFREQ is not set
 # 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_ANCIENT_MCE is not set

-# CONFIG_X86_BIGSMP is not set

 CONFIG_X86_BSWAP=y
 # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
 CONFIG_X86_BSWAP=y
 # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set

-# CONFIG_X86_CMOV is not set
-# CONFIG_X86_CMPXCHG64 is not set

 CONFIG_X86_CMPXCHG=y
 CONFIG_X86_CMPXCHG=y

-# CONFIG_X86_CPU_DEBUG is not set
+CONFIG_X86_CPU=y

 # 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=y
-# CONFIG_X86_DEBUGCTLMSR is not set
-# CONFIG_X86_DS is not set
-# CONFIG_X86_ELAN is not set
-# CONFIG_X86_E_POWERSAVER is not set

 # CONFIG_X86_EXTENDED_PLATFORM is not set
 # CONFIG_X86_EXTENDED_PLATFORM is not set

+# CONFIG_X86_E_POWERSAVER is not set

 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

-# CONFIG_X86_HT is not set

 CONFIG_X86_INTEL_USERCOPY=y
 CONFIG_X86_INTERNODE_CACHE_BYTES=64
 CONFIG_X86_INVLPG=y
 CONFIG_X86_IO_APIC=y
 CONFIG_X86_L1_CACHE_BYTES=64
 CONFIG_X86_INTEL_USERCOPY=y
 CONFIG_X86_INTERNODE_CACHE_BYTES=64
 CONFIG_X86_INVLPG=y
 CONFIG_X86_IO_APIC=y
 CONFIG_X86_L1_CACHE_BYTES=64

-CONFIG_X86_L1_CACHE_SHIFT=6
+CONFIG_X86_L1_CACHE_SHIFT=4

 CONFIG_X86_LOCAL_APIC=y
 # CONFIG_X86_LONGHAUL is not set
 # CONFIG_X86_LONGRUN is not set
 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
 # CONFIG_X86_MCE_INJECT is not set
 CONFIG_X86_MCE_INTEL=y
 CONFIG_X86_MCE_THRESHOLD=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=4
 CONFIG_X86_MPPARSE=y
 CONFIG_X86_MINIMUM_CPU_FAMILY=4
 CONFIG_X86_MPPARSE=y

-# CONFIG_X86_MRST is not set

 # CONFIG_X86_MSR is not set
 # CONFIG_X86_MSR is not set

-# CONFIG_X86_OLD_MCE is not set

 # CONFIG_X86_P4_CLOCKMOD is not set
 # CONFIG_X86_PAE is not set
 CONFIG_X86_PAT=y
 # CONFIG_X86_P4_CLOCKMOD is not set
 # CONFIG_X86_PAE is not set
 CONFIG_X86_PAT=y


@@ -489,7 +406,6 @@ CONFIG_X86_POPAD_OK=y
 # CONFIG_X86_POWERNOW_K7 is not set
 # CONFIG_X86_POWERNOW_K8 is not set
 CONFIG_X86_PPRO_FENCE=y
 # CONFIG_X86_POWERNOW_K7 is not set
 # CONFIG_X86_POWERNOW_K8 is not set
 CONFIG_X86_PPRO_FENCE=y

-# CONFIG_X86_RDC321X 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_REBOOTFIXUPS is not set
 CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
 CONFIG_X86_RESERVE_LOW_64K=y


@@ -499,24 +415,9 @@ CONFIG_X86_RESERVE_LOW_64K=y
 # CONFIG_X86_SPEEDSTEP_SMI is not set
 CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_X86_THERMAL_VECTOR=y
 # CONFIG_X86_SPEEDSTEP_SMI is not set
 CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_X86_THERMAL_VECTOR=y

-# CONFIG_X86_TRAMPOLINE is not set
-# CONFIG_X86_TSC is not set

 CONFIG_X86_UP_APIC=y
 CONFIG_X86_UP_IOAPIC=y
 CONFIG_X86_UP_APIC=y
 CONFIG_X86_UP_IOAPIC=y

-# CONFIG_X86_USE_PPRO_CHECKSUM is not set

 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_XEN_BALLOON is not set
-# CONFIG_XEN_BLKDEV_FRONTEND is not set
-# CONFIG_XEN_DEBUG_FS is not set
-# CONFIG_XEN_DEV_EVTCHN is not set
-# CONFIG_XENFS is not set
-# CONFIG_XEN is not set
-# CONFIG_XEN_MAX_DOMAIN_MEMORY is not set
-# CONFIG_XEN_NETDEV_FRONTEND is not set
-# CONFIG_XEN_SAVE_RESTORE is not set
-# CONFIG_XEN_SCRUB_PAGES is not set
-# CONFIG_XEN_SYS_HYPERVISOR is not set

 # CONFIG_ZONE_DMA32 is not set
 # CONFIG_ZONE_DMA32 is not set