diff options
| author | Fred Fan <r01011@freescale.com> | 2010-01-26 19:33:19 +0800 |
|---|---|---|
| committer | Alejandro Gonzalez <alex.gonzalez@digi.com> | 2010-05-25 11:09:57 +0200 |
| commit | 500dacc19f8e5c04c6c4c5090b81962eaaba41f6 (patch) | |
| tree | 255e6808704116701126f7d4df54a5382aa09362 /arch/arm | |
| parent | eb729944746b65cf2579c633200aef18713582f7 (diff) | |
ENGR00117739-3 i.MX28 EVK watchdog support
Change i.MX28 evk defconfig
Signed-off-by: Fred.fan <r01011@freescale.com>
Signed-off-by: Alejandro Gonzalez <alex.gonzalez@digi.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/configs/imx28evk_defconfig | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/arch/arm/configs/imx28evk_defconfig b/arch/arm/configs/imx28evk_defconfig index 6adbcfb1642b..3afc5ba817fa 100644 --- a/arch/arm/configs/imx28evk_defconfig +++ b/arch/arm/configs/imx28evk_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.31 -# Mon Jan 25 15:59:49 2010 +# Tue Jan 26 17:25:51 2010 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -641,7 +641,14 @@ CONFIG_GPIOLIB=y # CONFIG_HWMON is not set # CONFIG_THERMAL is not set # CONFIG_THERMAL_HWMON is not set -# CONFIG_WATCHDOG is not set +CONFIG_WATCHDOG=y +# CONFIG_WATCHDOG_NOWAYOUT is not set + +# +# Watchdog Device Drivers +# +# CONFIG_SOFT_WATCHDOG is not set +CONFIG_MXS_WATCHDOG=y CONFIG_SSB_POSSIBLE=y # |