ar71xx: use 4k erase size images for ubnt xm

[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..6616001 100644 (file)
--- a/target/linux/x86/config-2.6.31
+++ b/target/linux/x86/config-2.6.31
@@ -93,7 +93,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
@@ -168,7 +167,6 @@ 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
@@ -309,6 +307,7 @@ CONFIG_PHYSICAL_START=0x1000000
 # CONFIG_PNPBIOS is not set
 CONFIG_PNP_DEBUG_MESSAGES=y
 CONFIG_PNP=y
+# CONFIG_PROCESSOR_SELECT is not set
 CONFIG_PROC_PAGE_MONITOR=y
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
 CONFIG_RD_BZIP2=y
@@ -345,7 +344,6 @@ 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
@@ -408,6 +406,7 @@ 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_PPRO_FENCE=y