From: Ezequiel Garcia Date: Mon, 10 Feb 2014 23:00:36 +0000 (-0300) Subject: ARM: mvebu: Enable watchdog support in defconfig X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a96beda759f10bce58c64c2f2953331ed771a734;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git ARM: mvebu: Enable watchdog support in defconfig Now that we have proper support for Armada 370/XP watchdog let's enable it in mvebu_defconfig and multi_v7_defconfig. Signed-off-by: Ezequiel Garcia Signed-off-by: Jason Cooper --- diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 845bc745706b..51cee833333c 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -187,6 +187,8 @@ CONFIG_POWER_RESET_GPIO=y CONFIG_SENSORS_LM90=y CONFIG_THERMAL=y CONFIG_ARMADA_THERMAL=y +CONFIG_WATCHDOG=y +CONFIG_ORION_WATCHDOG=y CONFIG_MFD_AS3722=y CONFIG_MFD_CROS_EC=y CONFIG_MFD_CROS_EC_SPI=y diff --git a/arch/arm/configs/mvebu_v7_defconfig b/arch/arm/configs/mvebu_v7_defconfig index 5c58559d7a0c..0ce72c159ab8 100644 --- a/arch/arm/configs/mvebu_v7_defconfig +++ b/arch/arm/configs/mvebu_v7_defconfig @@ -67,6 +67,8 @@ CONFIG_SND=y CONFIG_SND_SOC=y CONFIG_SND_KIRKWOOD_SOC=y CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB=y +CONFIG_WATCHDOG=y +CONFIG_ORION_WATCHDOG=y CONFIG_USB_SUPPORT=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y