diff options
| author |   Carlo Caione <carlo@caione.org> | 2014-09-20 19:06:52 +0200 |
|---|---|---|
| committer |   Wim Van Sebroeck <wim@iguana.be> | 2014-10-20 21:02:14 +0200 |
| commit | 69a160a0543fd569661048a8692c10afcdb1914b (patch) | |
| tree | 62407710ca1b6a04ebe6042cdc696c76f5002a46 /arch | |
| parent | ARM: meson: add watchdog driver (diff) | |
| download | linux-dev-69a160a0543fd569661048a8692c10afcdb1914b.tar.xz linux-dev-69a160a0543fd569661048a8692c10afcdb1914b.zip | |
ARM: defconfig: update multi_v7_defconfig
Update the multi_v7_defconfig enabling the watchdog driver for Meson
SoCs.
Signed-off-by: Carlo Caione <carlo@caione.org>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 491b7d5523bf..9702b140ae04 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -261,6 +261,7 @@ CONFIG_WATCHDOG=y CONFIG_XILINX_WATCHDOG=y CONFIG_ORION_WATCHDOG=y CONFIG_SUNXI_WATCHDOG=y +CONFIG_MESON_WATCHDOG=y CONFIG_MFD_AS3722=y CONFIG_MFD_BCM590XX=y CONFIG_MFD_CROS_EC=y |