aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mpc85xx
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-04-29 15:00:36 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-04-29 15:00:36 +0000
commit9f03b39d0706e1b383d13b0a6d89ca26ce8af4d3 (patch)
tree86b88766c067545cbaf8188ddb51cd896226a32a /target/linux/mpc85xx
parentd7df86f4a9ddf985cc318b25a5fa021c2f1a110b (diff)
downloadupstream-9f03b39d0706e1b383d13b0a6d89ca26ce8af4d3.tar.gz
upstream-9f03b39d0706e1b383d13b0a6d89ca26ce8af4d3.tar.bz2
upstream-9f03b39d0706e1b383d13b0a6d89ca26ce8af4d3.zip
mpc85xx: don't override CONFIG_WATHCDOG
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31521 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/mpc85xx')
-rw-r--r--target/linux/mpc85xx/config-default1
1 files changed, 0 insertions, 1 deletions
diff --git a/target/linux/mpc85xx/config-default b/target/linux/mpc85xx/config-default
index 7aedd52757..269c30ff2e 100644
--- a/target/linux/mpc85xx/config-default
+++ b/target/linux/mpc85xx/config-default
@@ -239,6 +239,5 @@ CONFIG_UCC_GETH=y
# CONFIG_UGETH_TX_ON_DEMAND is not set
CONFIG_USB_SUPPORT=y
CONFIG_VM_EVENT_COUNTERS=y
-# CONFIG_WATCHDOG is not set
CONFIG_WORD_SIZE=32
# CONFIG_XES_MPC85xx is not set