aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2014-02-20 17:26:08 +0000
committerLuka Perkov <luka@openwrt.org>2014-02-20 17:26:08 +0000
commita52100469f7f0544640f2914d66c68631787bddf (patch)
tree4e80b228a5cc14a301be7a5a19a0ba8f022199cd
parent4e0309630b871ecaf9e247b479c4a4ef3f9667f8 (diff)
downloadupstream-a52100469f7f0544640f2914d66c68631787bddf.tar.gz
upstream-a52100469f7f0544640f2914d66c68631787bddf.tar.bz2
upstream-a52100469f7f0544640f2914d66c68631787bddf.zip
imx6: enable IMX6 watchdog
Signed-off-by: Tim Harvey <tharvey@gateworks.com> SVN-Revision: 39643
-rw-r--r--target/linux/imx6/config-3.102
-rw-r--r--target/linux/imx6/config-3.132
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/imx6/config-3.10 b/target/linux/imx6/config-3.10
index 3dad5b67e5..3e69d68e7e 100644
--- a/target/linux/imx6/config-3.10
+++ b/target/linux/imx6/config-3.10
@@ -194,7 +194,7 @@ CONFIG_I2C=y
CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_CHARDEV=y
CONFIG_I2C_IMX=y
-# CONFIG_IMX2_WDT is not set
+CONFIG_IMX2_WDT=y
# CONFIG_IMX_DMA is not set
# CONFIG_IMX_SDMA is not set
CONFIG_INITRAMFS_SOURCE=""
diff --git a/target/linux/imx6/config-3.13 b/target/linux/imx6/config-3.13
index fdf9b722bd..2506a0a70f 100644
--- a/target/linux/imx6/config-3.13
+++ b/target/linux/imx6/config-3.13
@@ -195,7 +195,7 @@ CONFIG_I2C=y
CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_CHARDEV=y
CONFIG_I2C_IMX=y
-# CONFIG_IMX2_WDT is not set
+CONFIG_IMX2_WDT=y
CONFIG_IMX_DMA=y
CONFIG_IMX_SDMA=y
# CONFIG_IMX_WEIM is not set