From 7db6197f88bbd91afb6a80994f378e759d11f94b Mon Sep 17 00:00:00 2001 From: kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73> Date: Mon, 15 Jun 2009 07:45:06 +0000 Subject: [PATCH] IKCONFIG shouldn't be enabled by default git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16473 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/generic-2.6/config-2.6.21 | 4 ++-- target/linux/octeon/config-default | 2 -- target/linux/olpc/config-2.6.27 | 2 -- target/linux/pxa/config-default | 1 - target/linux/s3c24xx/config-2.6.28 | 2 -- target/linux/s3c24xx/config-2.6.29 | 2 -- target/linux/s3c24xx/config-2.6.30 | 2 -- 7 files changed, 2 insertions(+), 13 deletions(-) diff --git a/target/linux/generic-2.6/config-2.6.21 b/target/linux/generic-2.6/config-2.6.21 index 512dc16ce..07933f8df 100644 --- a/target/linux/generic-2.6/config-2.6.21 +++ b/target/linux/generic-2.6/config-2.6.21 @@ -439,8 +439,8 @@ CONFIG_IDE_MAX_HWIFS=4 # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set # CONFIG_IEEE80211_SOFTMAC is not set # CONFIG_IFB is not set -CONFIG_IKCONFIG_PROC=y -CONFIG_IKCONFIG=y +# CONFIG_IKCONFIG_PROC is not set +# CONFIG_IKCONFIG is not set # CONFIG_IMQ_BEHAVIOR_AA is not set # CONFIG_IMQ_BEHAVIOR_AB is not set CONFIG_IMQ_BEHAVIOR_BA=y diff --git a/target/linux/octeon/config-default b/target/linux/octeon/config-default index 4f2703047..d0c6cc1e6 100644 --- a/target/linux/octeon/config-default +++ b/target/linux/octeon/config-default @@ -148,8 +148,6 @@ CONFIG_HZ=250 # 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 diff --git a/target/linux/olpc/config-2.6.27 b/target/linux/olpc/config-2.6.27 index 54994ac53..2f1f9d321 100644 --- 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 diff --git a/target/linux/pxa/config-default b/target/linux/pxa/config-default index 45b0726b7..eb0770fd5 100644 --- a/target/linux/pxa/config-default +++ b/target/linux/pxa/config-default @@ -113,7 +113,6 @@ CONFIG_IDE=m CONFIG_IDE_GENERIC=m # CONFIG_IEEE80211_SOFTMAC is not set # CONFIG_IFB is not set -# CONFIG_IKCONFIG is not set # CONFIG_INET_DIAG is not set CONFIG_INOTIFY=y CONFIG_INOTIFY_USER=y diff --git a/target/linux/s3c24xx/config-2.6.28 b/target/linux/s3c24xx/config-2.6.28 index 3e3931255..ca9179512 100644 --- a/target/linux/s3c24xx/config-2.6.28 +++ b/target/linux/s3c24xx/config-2.6.28 @@ -211,8 +211,6 @@ CONFIG_I2C_CHARDEV=y CONFIG_I2C_HELPER_AUTO=y CONFIG_I2C_S3C2410=y # CONFIG_IDE is not set -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y CONFIG_INET_DIAG=y CONFIG_INET_TCP_DIAG=y CONFIG_INITRAMFS_SOURCE="" diff --git a/target/linux/s3c24xx/config-2.6.29 b/target/linux/s3c24xx/config-2.6.29 index a6695e79a..98e3600ed 100644 --- a/target/linux/s3c24xx/config-2.6.29 +++ b/target/linux/s3c24xx/config-2.6.29 @@ -206,8 +206,6 @@ CONFIG_I2C_BOARDINFO=y CONFIG_I2C_CHARDEV=y CONFIG_I2C_HELPER_AUTO=y CONFIG_I2C_S3C2410=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y CONFIG_INET_DIAG=y CONFIG_INET_TCP_DIAG=y CONFIG_INITRAMFS_SOURCE="" diff --git a/target/linux/s3c24xx/config-2.6.30 b/target/linux/s3c24xx/config-2.6.30 index 4bb2e88ce..16b0049ec 100644 --- a/target/linux/s3c24xx/config-2.6.30 +++ b/target/linux/s3c24xx/config-2.6.30 @@ -176,8 +176,6 @@ CONFIG_I2C=y CONFIG_I2C_BOARDINFO=y CONFIG_I2C_CHARDEV=y CONFIG_I2C_S3C2410=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y CONFIG_INET_DIAG=y CONFIG_INET_TCP_DIAG=y CONFIG_INITRAMFS_SOURCE="" -- 2.20.1