aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-04-29 15:00:34 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-04-29 15:00:34 +0000
commitd7df86f4a9ddf985cc318b25a5fa021c2f1a110b (patch)
treea80bf3c142d383447ba142e7e029fe42f9753127
parent5613414b3de6c0b99c334d90100ae3bd4b88bfb9 (diff)
downloadupstream-d7df86f4a9ddf985cc318b25a5fa021c2f1a110b.tar.gz
upstream-d7df86f4a9ddf985cc318b25a5fa021c2f1a110b.tar.bz2
upstream-d7df86f4a9ddf985cc318b25a5fa021c2f1a110b.zip
linux: move CONFIG_BOOKE_WDT to the generic config
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31520 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/generic/config-2.6.381
-rw-r--r--target/linux/generic/config-3.21
-rw-r--r--target/linux/generic/config-3.31
-rw-r--r--target/linux/ppc40x/config-3.31
-rw-r--r--target/linux/ppc44x/config-default1
5 files changed, 3 insertions, 2 deletions
diff --git a/target/linux/generic/config-2.6.38 b/target/linux/generic/config-2.6.38
index d00e4a0c9c..5194f32ee9 100644
--- a/target/linux/generic/config-2.6.38
+++ b/target/linux/generic/config-2.6.38
@@ -267,6 +267,7 @@ CONFIG_BLOCK=y
# CONFIG_BNA is not set
# CONFIG_BNX2 is not set
# CONFIG_BONDING is not set
+# CONFIG_BOOKE_WDT is not set
# CONFIG_BOOT_PRINTK_DELAY is not set
CONFIG_BOOT_RAW=y
# CONFIG_BPQETHER is not set
diff --git a/target/linux/generic/config-3.2 b/target/linux/generic/config-3.2
index fe32ae3f2d..209d4a87f9 100644
--- a/target/linux/generic/config-3.2
+++ b/target/linux/generic/config-3.2
@@ -273,6 +273,7 @@ CONFIG_BLOCK=y
# CONFIG_BNX2 is not set
# CONFIG_BNX2X is not set
# CONFIG_BONDING is not set
+# CONFIG_BOOKE_WDT is not set
# CONFIG_BOOT_PRINTK_DELAY is not set
CONFIG_BOOT_RAW=y
# CONFIG_BPQETHER is not set
diff --git a/target/linux/generic/config-3.3 b/target/linux/generic/config-3.3
index 98f9825cb4..244e7988e7 100644
--- a/target/linux/generic/config-3.3
+++ b/target/linux/generic/config-3.3
@@ -280,6 +280,7 @@ CONFIG_BLOCK=y
# CONFIG_BNX2 is not set
# CONFIG_BNX2X is not set
# CONFIG_BONDING is not set
+# CONFIG_BOOKE_WDT is not set
# CONFIG_BOOT_PRINTK_DELAY is not set
CONFIG_BOOT_RAW=y
# CONFIG_BPQETHER is not set
diff --git a/target/linux/ppc40x/config-3.3 b/target/linux/ppc40x/config-3.3
index 664a81b2cd..35f47d23f7 100644
--- a/target/linux/ppc40x/config-3.3
+++ b/target/linux/ppc40x/config-3.3
@@ -23,7 +23,6 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y
CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
CONFIG_AUDIT_ARCH=y
CONFIG_BCMA_POSSIBLE=y
-# CONFIG_BOOKE_WDT is not set
CONFIG_BOUNCE=y
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_CMDLINE="console=ttyS0,115200 rootfstype=squashfs,jffs2 noinitrd"
diff --git a/target/linux/ppc44x/config-default b/target/linux/ppc44x/config-default
index ffbbc0a8e4..85edef075d 100644
--- a/target/linux/ppc44x/config-default
+++ b/target/linux/ppc44x/config-default
@@ -22,7 +22,6 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
CONFIG_AUDIT_ARCH=y
# CONFIG_BAMBOO is not set
CONFIG_BITREVERSE=y
-# CONFIG_BOOKE_WDT is not set
CONFIG_BOOKE=y
CONFIG_BOUNCE=y
# CONFIG_BLUESTONE is not set