From: Lee Jones <lee.jones@linaro.org>
Date: Thu, 9 Apr 2015 14:47:27 +0000 (+0100)
Subject: ARM: multi_v7_defconfig: Enable support for ST's LPC Watchdog
X-Git-Tag: v4.2-rc1~45^2~35
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=97faf05aa63683d288423230b26bb57c781b2edd;p=karo-tx-linux.git

ARM: multi_v7_defconfig: Enable support for ST's LPC Watchdog

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
---

diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index fbbb1915c6a9..1e8c00c59efc 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -337,6 +337,7 @@ CONFIG_WATCHDOG=y
 CONFIG_XILINX_WATCHDOG=y
 CONFIG_ARM_SP805_WATCHDOG=y
 CONFIG_ORION_WATCHDOG=y
+CONFIG_ST_LPC_WATCHDOG=y
 CONFIG_SUNXI_WATCHDOG=y
 CONFIG_MESON_WATCHDOG=y
 CONFIG_MFD_AS3711=y