OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
bc0195a
)
ARM: multi_v7_defconfig: enable Conexant Digicolor watchdog
author
Baruch Siach
<baruch@tkos.co.il>
Mon, 6 Jul 2015 11:41:44 +0000
(14:41 +0300)
committer
Olof Johansson
<olof@lixom.net>
Tue, 14 Jul 2015 09:20:48 +0000
(11:20 +0200)
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm/configs/multi_v7_defconfig
patch
|
blob
|
history
diff --git
a/arch/arm/configs/multi_v7_defconfig
b/arch/arm/configs/multi_v7_defconfig
index
5fd8df6
..
595acd6
100644
(file)
--- a/
arch/arm/configs/multi_v7_defconfig
+++ b/
arch/arm/configs/multi_v7_defconfig
@@
-371,6
+371,7
@@
CONFIG_ORION_WATCHDOG=y
CONFIG_ST_LPC_WATCHDOG=y
CONFIG_SUNXI_WATCHDOG=y
CONFIG_MESON_WATCHDOG=y
+CONFIG_DIGICOLOR_WATCHDOG=y
CONFIG_MFD_AS3711=y
CONFIG_MFD_AS3722=y
CONFIG_MFD_BCM590XX=y