diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2014-09-04 19:59:16 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2014-09-04 19:59:16 +0200 |
| commit | a8e154bbc66462715431d8511ba27d5388e0e87f (patch) | |
| tree | f8d3eb4fa27fa097434be927e7717ed8b892814d | |
| parent | fd7b538b8bccaf3b6ab4be5cb485df76f40f317d (diff) | |
imx6 defconfig: remove CONFIG_WATCHDOG_NOWAYOUT
Colibri/Apalis Txx and Colibri VFxx have this configuration
also not set. Be consistent.
| -rw-r--r-- | arch/arm/configs/apalis_imx6_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/colibri_imx6_defconfig | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/configs/apalis_imx6_defconfig b/arch/arm/configs/apalis_imx6_defconfig index 11bf31db8ccf..588738360d7f 100644 --- a/arch/arm/configs/apalis_imx6_defconfig +++ b/arch/arm/configs/apalis_imx6_defconfig @@ -177,7 +177,6 @@ CONFIG_CPU_THERMAL=y CONFIG_IMX_THERMAL=y CONFIG_DEVICE_THERMAL=y CONFIG_WATCHDOG=y -CONFIG_WATCHDOG_NOWAYOUT=y CONFIG_IMX2_WDT=y CONFIG_MFD_STMPE=y CONFIG_REGULATOR=y diff --git a/arch/arm/configs/colibri_imx6_defconfig b/arch/arm/configs/colibri_imx6_defconfig index ae05bb696223..657e961b352e 100644 --- a/arch/arm/configs/colibri_imx6_defconfig +++ b/arch/arm/configs/colibri_imx6_defconfig @@ -169,7 +169,6 @@ CONFIG_CPU_THERMAL=y CONFIG_IMX_THERMAL=y CONFIG_DEVICE_THERMAL=y CONFIG_WATCHDOG=y -CONFIG_WATCHDOG_NOWAYOUT=y CONFIG_IMX2_WDT=y CONFIG_MFD_STMPE=y CONFIG_REGULATOR=y |