From: Lee Jones Date: Thu, 9 Apr 2015 14:47:00 +0000 (+0200) Subject: ARM: multi_v7_defconfig: Enable support for ST's LPC Watchdog X-Git-Tag: omap-for-v4.2/fixes-rc1^2~101^2~41^2~1 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b344b9669930ec36b86b639ee71bb6bf3ba425a;p=pandora-kernel.git ARM: multi_v7_defconfig: Enable support for ST's LPC Watchdog Signed-off-by: Lee Jones Signed-off-by: Maxime Coquelin --- diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index ab86655c1f4b..8a566fd8f7b9 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -334,6 +334,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