From 70322ba3d1a897e1ff1c5d8c117a332815e7649e Mon Sep 17 00:00:00 2001
From: Gabor Juhos <juhosg@openwrt.org>
Date: Tue, 1 May 2012 08:00:25 +0000
Subject: [PATCH] move CONFIG_BOOKE_WDT_DEFAULT_TIMEOUT to the target configs

SVN-Revision: 31547
---
 package/kernel/modules/other.mk     | 4 +---
 target/linux/mpc85xx/config-3.3     | 1 +
 target/linux/mpc85xx/config-default | 1 +
 target/linux/ppc40x/config-3.3      | 1 +
 target/linux/ppc44x/config-default  | 1 +
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index 0a467f92fda..06f1f78d3fb 100644
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -724,9 +724,7 @@ define KernelPackage/booke-wdt
   SUBMENU:=$(OTHER_MENU)
   TITLE:=PowerPC Book-E Watchdog Timer
   DEPENDS:=@(TARGET_mpc85xx||TARGET_ppc40x||TARGET_ppc44x)
-  KCONFIG:=\
-	CONFIG_BOOKE_WDT_DEFAULT_TIMEOUT=38 \
-	CONFIG_BOOKE_WDT
+  KCONFIG:=CONFIG_BOOKE_WDT
   FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/booke_wdt.ko
   AUTOLOAD:=$(call AutoLoad,50,booke_wdt)
 endef
diff --git a/target/linux/mpc85xx/config-3.3 b/target/linux/mpc85xx/config-3.3
index 56aefb5c0fd..51be9d639dd 100644
--- a/target/linux/mpc85xx/config-3.3
+++ b/target/linux/mpc85xx/config-3.3
@@ -20,6 +20,7 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 CONFIG_AUDIT_ARCH=y
 CONFIG_BCMA_POSSIBLE=y
 CONFIG_BOOKE=y
+CONFIG_BOOKE_WDT_DEFAULT_TIMEOUT=38
 CONFIG_BOUNCE=y
 CONFIG_CMDLINE="console=ttyS0,115200"
 CONFIG_CMDLINE_BOOL=y
diff --git a/target/linux/mpc85xx/config-default b/target/linux/mpc85xx/config-default
index 269c30ff2ed..4eb9824c2a6 100644
--- a/target/linux/mpc85xx/config-default
+++ b/target/linux/mpc85xx/config-default
@@ -20,6 +20,7 @@ CONFIG_AUDIT_ARCH=y
 # CONFIG_AUTO_IRQ_AFFINITY is not set
 CONFIG_BKL=y
 CONFIG_BOOKE=y
+CONFIG_BOOKE_WDT_DEFAULT_TIMEOUT=38
 CONFIG_BOUNCE=y
 CONFIG_CMDLINE="console=ttyS0,115200"
 CONFIG_CMDLINE_BOOL=y
diff --git a/target/linux/ppc40x/config-3.3 b/target/linux/ppc40x/config-3.3
index 35f47d23f72..0356b49a718 100644
--- a/target/linux/ppc40x/config-3.3
+++ b/target/linux/ppc40x/config-3.3
@@ -23,6 +23,7 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 CONFIG_AUDIT_ARCH=y
 CONFIG_BCMA_POSSIBLE=y
+CONFIG_BOOKE_WDT_DEFAULT_TIMEOUT=3
 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 85edef075da..8575d2b6af6 100644
--- a/target/linux/ppc44x/config-default
+++ b/target/linux/ppc44x/config-default
@@ -23,6 +23,7 @@ CONFIG_AUDIT_ARCH=y
 # CONFIG_BAMBOO is not set
 CONFIG_BITREVERSE=y
 CONFIG_BOOKE=y
+CONFIG_BOOKE_WDT_DEFAULT_TIMEOUT=3
 CONFIG_BOUNCE=y
 # CONFIG_BLUESTONE is not set
 CONFIG_CANYONLANDS=y
-- 
2.30.2