]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
projects / mirror_ubuntu-hirsute-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 22e1b8f)
ARM: defconfig: update multi_v7_defconfig
authorCarlo Caione <carlo@caione.org>
Sat, 20 Sep 2014 17:06:52 +0000 (19:06 +0200)
committerWim Van Sebroeck <wim@iguana.be>
Mon, 20 Oct 2014 19:02:14 +0000 (21:02 +0200)
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>
arch/arm/configs/multi_v7_defconfig patch | blob | blame | history

diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 491b7d5523bf8f2d2f741f078739b168443dfa8d..9702b140ae041d40aca40be34402bbf3c490d106 100644 (file)
--- 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
Ubuntu Hirsute Linux kernel mirror