kernel: add a patch for union mounts in 2.6.31

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

diff --git a/target/linux/olpc/config-2.6.27 b/target/linux/olpc/config-2.6.27
index 54994ac..dd1b708 100644 (file)
--- a/target/linux/olpc/config-2.6.27
+++ b/target/linux/olpc/config-2.6.27
@@ -265,8 +265,6 @@ CONFIG_I2C_BOARDINFO=y
 # CONFIG_IDE is not set
 # CONFIG_IEEE80211 is not set
 # CONFIG_IFB is not set
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
 # CONFIG_INET_AH is not set
 # CONFIG_INET_ESP is not set
 # CONFIG_INET_IPCOMP is not set
@@ -543,7 +541,6 @@ CONFIG_THERMAL=y
 CONFIG_TICK_ONESHOT=y
 CONFIG_TIMER_STATS=y
 # CONFIG_TOSHIBA is not set
-# CONFIG_TUN is not set
 # CONFIG_UDF_FS is not set
 CONFIG_UID16=y
 CONFIG_USB=y