Add config file for 2.6.31 kernels in preparation for 2.6.31

[openwrt.git] / target / linux / octeon / config-default

diff --git a/target/linux/octeon/config-default b/target/linux/octeon/config-default
index d0c6cc1..fce2682 100644 (file)
--- a/target/linux/octeon/config-default
+++ b/target/linux/octeon/config-default
@@ -101,7 +101,6 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y
 CONFIG_DECOMPRESS_LZMA=y
 CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_DEADLINE is not set
 CONFIG_DECOMPRESS_LZMA=y
 CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_DEADLINE is not set

-CONFIG_DEFAULT_IOSCHED="cfq"

 CONFIG_DETECT_HUNG_TASK=y
 CONFIG_DETECT_SOFTLOCKUP=y
 CONFIG_DEVKMEM=y
 CONFIG_DETECT_HUNG_TASK=y
 CONFIG_DETECT_SOFTLOCKUP=y
 CONFIG_DEVKMEM=y


@@ -156,8 +155,6 @@ CONFIG_INET_XFRM_MODE_TUNNEL=y
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INOTIFY=y
 CONFIG_INOTIFY_USER=y
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INOTIFY=y
 CONFIG_INOTIFY_USER=y

-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_CFQ=y

 CONFIG_IP_PIMSM_V1=y
 CONFIG_IP_PIMSM_V2=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PIMSM_V1=y
 CONFIG_IP_PIMSM_V2=y
 CONFIG_IP_PNP=y


@@ -206,7 +203,6 @@ CONFIG_MTD_PHYSMAP=y
 # CONFIG_NATSEMI is not set
 # CONFIG_NETLABEL is not set
 # CONFIG_NETWORK_FILESYSTEMS is not set
 # CONFIG_NATSEMI is not set
 # CONFIG_NETLABEL is not set
 # CONFIG_NETWORK_FILESYSTEMS is not set

-# CONFIG_NET_SCHED is not set

 # CONFIG_NO_IOPORT is not set
 CONFIG_NR_CPUS=16
 CONFIG_NR_CPUS_DEFAULT_16=y
 # CONFIG_NO_IOPORT is not set
 CONFIG_NR_CPUS=16
 CONFIG_NR_CPUS_DEFAULT_16=y