[target] stay coherent when defining ARCH

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

diff --git a/target/linux/x86/config-2.6.31 b/target/linux/x86/config-2.6.31
index 7c281de..31e015a 100644 (file)
--- a/target/linux/x86/config-2.6.31
+++ b/target/linux/x86/config-2.6.31
@@ -3,6 +3,26 @@ CONFIG_4KSTACKS=y
 # 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_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=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_ACQUIRE_WDT is not set
 # CONFIG_ADVANTECH_WDT is not set
 # CONFIG_AGP is not set
@@ -25,6 +45,7 @@ CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=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_GENERIC=y
 CONFIG_ATA_PIIX=y
@@ -77,6 +98,7 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
 # CONFIG_DEPCA is not set
 CONFIG_DEVPORT=y
 # CONFIG_DMA_API_DEBUG is not set
+# CONFIG_DMAR is not set
 # CONFIG_DMIID is not set
 CONFIG_DMI=y
 CONFIG_DNOTIFY=y
@@ -86,6 +108,8 @@ CONFIG_DUMMY_CONSOLE=y
 CONFIG_EARLY_PRINTK=y
 # CONFIG_EDAC is not set
 # CONFIG_EDD is not set
+# CONFIG_EEEPC_LAPTOP is not set
+# CONFIG_EFI is not set
 # CONFIG_EISA is not set
 # CONFIG_EL16 is not set
 # CONFIG_EL1 is not set
@@ -93,7 +117,6 @@ CONFIG_EARLY_PRINTK=y
 # CONFIG_EL3 is not set
 CONFIG_ELF_CORE=y
 # CONFIG_ELPLUS is not set
-# CONFIG_EMBEDDED is not set
 # CONFIG_EUROTECH_WDT is not set
 CONFIG_EXT2_FS=y
 CONFIG_FAST_CMPXCHG_LOCAL=y
@@ -153,12 +176,15 @@ CONFIG_HAVE_MMIOTRACE_SUPPORT=y
 CONFIG_HAVE_OPROFILE=y
 CONFIG_HAVE_SETUP_PER_CPU_AREA=y
 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
+# CONFIG_HIBERNATION is not set
 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_MMAP=y
 # CONFIG_HPET_TIMER is not set
+CONFIG_HPET=y
 # CONFIG_HP_WATCHDOG is not set
 CONFIG_HT_IRQ=y
 # CONFIG_HUGETLBFS is not set
@@ -168,12 +194,12 @@ 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_IBM_ASM 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
@@ -183,6 +209,7 @@ CONFIG_INPUT_MOUSEDEV=y
 CONFIG_INPUT_MOUSE=y
 CONFIG_INPUT=y
 # CONFIG_INPUT_YEALINK is not set
+# CONFIG_INTEL_MENLOW is not set
 CONFIG_IO_DELAY_0X80=y
 # CONFIG_IO_DELAY_0XED is not set
 # CONFIG_IO_DELAY_NONE is not set
@@ -301,14 +328,20 @@ CONFIG_PCI_GOANY=y
 # CONFIG_PCI_GODIRECT is not set
 # CONFIG_PCI_GOMMCONFIG is not set
 # CONFIG_PCI_GOOLPC is not set
+CONFIG_PCI_MSI=y
 CONFIG_PCSPKR_PLATFORM=y
 # CONFIG_PCWATCHDOG is not set
+# CONFIG_PDA_POWER is not set
 CONFIG_PHYSICAL_ALIGN=0x100000
 CONFIG_PHYSICAL_START=0x1000000
+# CONFIG_PM_DEBUG is not set
+CONFIG_PM=y
 # CONFIG_PNPACPI is not set
 # CONFIG_PNPBIOS is not set
 CONFIG_PNP_DEBUG_MESSAGES=y
 CONFIG_PNP=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_RD_BZIP2=y
@@ -345,14 +378,16 @@ CONFIG_SERIO=y
 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_SPARSE_IRQ is not set
 CONFIG_SPARSEMEM_STATIC=y
 CONFIG_STRICT_DEVMEM=y
+# CONFIG_SUSPEND is not set
+# CONFIG_TC1100_WMI is not set
 # CONFIG_TELCLOCK is not set
+# CONFIG_THINKPAD_ACPI is not set
 # CONFIG_TOSHIBA is not set
 CONFIG_TRACING_SUPPORT=y
 # CONFIG_TYPHOON is not set
@@ -374,6 +409,7 @@ CONFIG_VT=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_CHECK_BIOS_CORRUPTION is not set
 # CONFIG_X86_CMPXCHG is not set
@@ -393,6 +429,7 @@ CONFIG_X86_IO_APIC=y
 CONFIG_X86_L1_CACHE_BYTES=64
 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_MCE_AMD=y
 # CONFIG_X86_MCE_INJECT is not set
@@ -408,8 +445,10 @@ CONFIG_X86_NEW_MCE=y
 # CONFIG_X86_PAE is not set
 CONFIG_X86_PAT=y
 CONFIG_X86_PLATFORM_DEVICES=y
+CONFIG_X86_PM_TIMER=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_RDC321X is not set
 # CONFIG_X86_REBOOTFIXUPS is not set