From: Baruch Siach Date: Mon, 6 Jul 2015 11:41:44 +0000 (+0300) Subject: ARM: multi_v7_defconfig: enable Conexant Digicolor watchdog X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f57eb528ec3116e988d3b0ca9cea37cb55f7b17a;p=linux-beck.git ARM: multi_v7_defconfig: enable Conexant Digicolor watchdog Signed-off-by: Baruch Siach Signed-off-by: Olof Johansson --- diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 5fd8df6f50ea..595acd693fa8 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -371,6 +371,7 @@ CONFIG_ORION_WATCHDOG=y CONFIG_ST_LPC_WATCHDOG=y CONFIG_SUNXI_WATCHDOG=y CONFIG_MESON_WATCHDOG=y +CONFIG_DIGICOLOR_WATCHDOG=y CONFIG_MFD_AS3711=y CONFIG_MFD_AS3722=y CONFIG_MFD_BCM590XX=y