From 3054efa82a4fb2e0ad4fa44450712e15f325a3a9 Mon Sep 17 00:00:00 2001
From: Imre Kaloz <kaloz@openwrt.org>
Date: Mon, 15 Jun 2009 07:45:06 +0000
Subject: IKCONFIG shouldn't be enabled by default

SVN-Revision: 16473
---
 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 512dc16ce5..07933f8df7 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 4f2703047e..d0c6cc1e6e 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 54994ac53e..2f1f9d321a 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 45b0726b7a..eb0770fd59 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 3e3931255c..ca9179512d 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 a6695e79a8..98e3600ed4 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 4bb2e88cef..16b0049ecb 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=""
-- 
cgit v1.2.3