kernel: refresh 2.6.30 patches

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

diff --git a/target/linux/octeon/config-default b/target/linux/octeon/config-default
index f366552..9511dc4 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


@@ -148,8 +147,6 @@ CONFIG_HZ=250
 # CONFIG_HZ_100 is not set
 CONFIG_HZ_250=y
 # CONFIG_I2C is not set
 # CONFIG_HZ_100 is not set
 CONFIG_HZ_250=y
 # CONFIG_I2C is not set

-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y

 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 CONFIG_INET_XFRM_MODE_BEET=y
 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 CONFIG_INET_XFRM_MODE_BEET=y


@@ -158,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


@@ -177,7 +172,6 @@ CONFIG_KEXEC=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
 # CONFIG_LEMOTE_FULONG is not set
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
 # CONFIG_LEMOTE_FULONG is not set

-CONFIG_LOCALVERSION_AUTO=y

 CONFIG_LOCK_KERNEL=y
 # CONFIG_LOCK_STAT is not set
 # CONFIG_MACH_ALCHEMY is not set
 CONFIG_LOCK_KERNEL=y
 # CONFIG_LOCK_STAT is not set
 # CONFIG_MACH_ALCHEMY is not set


@@ -209,8 +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_NEW_LEDS 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


@@ -236,7 +228,7 @@ CONFIG_POSIX_MQUEUE=y
 CONFIG_POSIX_MQUEUE_SYSCTL=y
 # CONFIG_PROBE_INITRD_HEADER is not set
 CONFIG_PROC_PAGE_MONITOR=y
 CONFIG_POSIX_MQUEUE_SYSCTL=y
 # CONFIG_PROBE_INITRD_HEADER is not set
 CONFIG_PROC_PAGE_MONITOR=y

-# CONFIG_PROM_EMU is not set
+

 # CONFIG_PROVE_LOCKING is not set
 # CONFIG_RCU_TORTURE_TEST is not set
 CONFIG_RELAY=y
 # CONFIG_PROVE_LOCKING is not set
 # CONFIG_RCU_TORTURE_TEST is not set
 CONFIG_RELAY=y