summaryrefslogtreecommitdiff
path: root/arch/arm/configs/multi_v7_defconfig
diff options
context:
space:
mode:
authorNicolas Ferre <nicolas.ferre@atmel.com>2016-04-26 17:59:18 +0200
committerNicolas Ferre <nicolas.ferre@atmel.com>2016-04-27 14:07:57 +0200
commit54b31de0be58d9a9704f91930af0e7a15866de99 (patch)
treed84495eb96c00bfb722702025bfa065cf85d8529 /arch/arm/configs/multi_v7_defconfig
parenta95c630724e368e97e7e38b84f4036f9eed49c08 (diff)
ARM: multi_v7_defconfig: add Atmel watchdog timers
Add both Atmel watchdog timers to the multi_v7_defconfig. They are added as part of the kernel because it's a core piece of the system. Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Diffstat (limited to 'arch/arm/configs/multi_v7_defconfig')
-rw-r--r--arch/arm/configs/multi_v7_defconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index af1e0c91a6f2..d72ee27cecae 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -430,6 +430,8 @@ CONFIG_WATCHDOG=y
CONFIG_DA9063_WATCHDOG=m
CONFIG_XILINX_WATCHDOG=y
CONFIG_ARM_SP805_WATCHDOG=y
+CONFIG_AT91SAM9X_WATCHDOG=y
+CONFIG_SAMA5D4_WATCHDOG=y
CONFIG_ORION_WATCHDOG=y
CONFIG_ST_LPC_WATCHDOG=y
CONFIG_SUNXI_WATCHDOG=y