[kirkwood] bump to 2.6.30-rc5

[openwrt.git] / target / linux / olpc / config-2.6.26

diff --git a/target/linux/olpc/config-2.6.26 b/target/linux/olpc/config-2.6.26
index 8cf8ed7..85bc153 100644 (file)
--- a/target/linux/olpc/config-2.6.26
+++ b/target/linux/olpc/config-2.6.26
@@ -351,7 +351,6 @@ CONFIG_KMOD=y
 CONFIG_KTIME_SCALAR=y
 # CONFIG_LATENCYTOP is not set
 CONFIG_LCD_CLASS_DEVICE=y
 CONFIG_KTIME_SCALAR=y
 # CONFIG_LATENCYTOP is not set
 CONFIG_LCD_CLASS_DEVICE=y

-# CONFIG_LEDS_ALIX is not set

 # CONFIG_LEDS_CLEVO_MAIL is not set
 # CONFIG_LIBERTAS is not set
 CONFIG_LIBERTAS_DEBUG=y
 # CONFIG_LEDS_CLEVO_MAIL is not set
 # CONFIG_LIBERTAS is not set
 CONFIG_LIBERTAS_DEBUG=y


@@ -568,11 +567,8 @@ CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
 # CONFIG_SND_USB_AUDIO is not set
 # CONFIG_SONYPI is not set
 CONFIG_SPARSEMEM_STATIC=y
 # CONFIG_SND_USB_AUDIO is not set
 # CONFIG_SONYPI is not set
 CONFIG_SPARSEMEM_STATIC=y

-# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-CONFIG_SSB_POSSIBLE=y

 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y

-CONFIG_SYSVIPC_SYSCTL=y

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