update to 2.6.32.7

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

diff --git a/target/linux/x86/olpc/config-2.6.31 b/target/linux/x86/olpc/config-2.6.31
index 1907d34..1da61fd 100644 (file)
--- a/target/linux/x86/olpc/config-2.6.31
+++ b/target/linux/x86/olpc/config-2.6.31
@@ -43,7 +43,6 @@ CONFIG_ARCH_WANT_FRAME_POINTERS=y
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 # CONFIG_ASUS_LAPTOP is not set
 CONFIG_ATA_GENERIC=y
-# CONFIG_ATA_NONSTANDARD is not set
 CONFIG_ATA_PIIX=y
 CONFIG_ATA=y
 # CONFIG_AUDIT_ARCH is not set
@@ -54,7 +53,6 @@ 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_BASE_SMALL=0
 CONFIG_BATTERY_OLPC=y
 CONFIG_BINARY_PRINTF=y
 CONFIG_BINFMT_MISC=y
@@ -255,7 +253,6 @@ CONFIG_HW_CONSOLE=y
 CONFIG_HW_RANDOM_GEODE=y
 CONFIG_HW_RANDOM_VIA=y
 CONFIG_HW_RANDOM=y
-# CONFIG_I2C is not set
 # CONFIG_I8K is not set
 # CONFIG_IMA is not set
 CONFIG_INITRAMFS_SOURCE=""
@@ -402,7 +399,6 @@ CONFIG_PCI_DOMAINS=y
 # CONFIG_PCI_GOMMCONFIG is not set
 CONFIG_PCI_GOOLPC=y
 CONFIG_PCI_OLPC=y
-CONFIG_PCI=y
 CONFIG_PCSPKR_PLATFORM=y
 # CONFIG_PDA_POWER is not set
 CONFIG_PERF_COUNTERS=y
@@ -458,7 +454,6 @@ CONFIG_SERIO=y
 CONFIG_SLUB_DEBUG=y
 # CONFIG_SLUB_STATS is not set
 CONFIG_SLUB=y
-# CONFIG_SMP is not set
 # CONFIG_SPARSE_IRQ is not set
 CONFIG_SPARSEMEM_STATIC=y
 CONFIG_STACKTRACE=y
@@ -469,7 +464,6 @@ CONFIG_SUSPEND=y
 # 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