diff options
author | Ezequiel Garcia <ezequiel.garcia@free-electrons.com> | 2014-02-10 18:00:36 -0500 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2014-02-17 16:47:30 -0500 |
commit | a96beda759f10bce58c64c2f2953331ed771a734 (patch) | |
tree | c5a1398f44525fb08c4b15ea3279f4a2ba142ebd | |
parent | aa75fe820d269cc9e3eefeaba52f780b3593afda (diff) |
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>
-rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 2 | ||||
-rw-r--r-- | arch/arm/configs/mvebu_v7_defconfig | 2 |
2 files changed, 4 insertions, 0 deletions
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 | |||
187 | CONFIG_SENSORS_LM90=y | 187 | CONFIG_SENSORS_LM90=y |
188 | CONFIG_THERMAL=y | 188 | CONFIG_THERMAL=y |
189 | CONFIG_ARMADA_THERMAL=y | 189 | CONFIG_ARMADA_THERMAL=y |
190 | CONFIG_WATCHDOG=y | ||
191 | CONFIG_ORION_WATCHDOG=y | ||
190 | CONFIG_MFD_AS3722=y | 192 | CONFIG_MFD_AS3722=y |
191 | CONFIG_MFD_CROS_EC=y | 193 | CONFIG_MFD_CROS_EC=y |
192 | CONFIG_MFD_CROS_EC_SPI=y | 194 | 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 | |||
67 | CONFIG_SND_SOC=y | 67 | CONFIG_SND_SOC=y |
68 | CONFIG_SND_KIRKWOOD_SOC=y | 68 | CONFIG_SND_KIRKWOOD_SOC=y |
69 | CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB=y | 69 | CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB=y |
70 | CONFIG_WATCHDOG=y | ||
71 | CONFIG_ORION_WATCHDOG=y | ||
70 | CONFIG_USB_SUPPORT=y | 72 | CONFIG_USB_SUPPORT=y |
71 | CONFIG_USB=y | 73 | CONFIG_USB=y |
72 | CONFIG_USB_EHCI_HCD=y | 74 | CONFIG_USB_EHCI_HCD=y |