summaryrefslogtreecommitdiff
path: root/arch/arm/configs/mvebu_v7_defconfig
diff options
context:
space:
mode:
authorEzequiel Garcia <ezequiel.garcia@free-electrons.com>2014-02-11 03:00:36 +0400
committerJason Cooper <jason@lakedaemon.net>2014-02-18 01:47:30 +0400
commita96beda759f10bce58c64c2f2953331ed771a734 (patch)
treec5a1398f44525fb08c4b15ea3279f4a2ba142ebd /arch/arm/configs/mvebu_v7_defconfig
parentaa75fe820d269cc9e3eefeaba52f780b3593afda (diff)
downloadlinux-a96beda759f10bce58c64c2f2953331ed771a734.tar.xz
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 <ezequiel.garcia@free-electrons.com> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm/configs/mvebu_v7_defconfig')
-rw-r--r--arch/arm/configs/mvebu_v7_defconfig2
1 files changed, 2 insertions, 0 deletions
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