git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'iwlwifi-next-for-kalle-2016-07-01' of git://git.kernel.org/pub/scm/linux...
[sfrench/cifs-2.6.git]
/
arch
/
arm64
/
configs
/
defconfig
diff --git
a/arch/arm64/configs/defconfig
b/arch/arm64/configs/defconfig
index 89171505e750c3597177fe0fbc3a1b65afe567da..fd2d74d0491ece760f65a551acd3f5304fc792fb 100644
(file)
--- a/
arch/arm64/configs/defconfig
+++ b/
arch/arm64/configs/defconfig
@@
-200,6
+200,8
@@
CONFIG_SENSORS_INA2XX=m
CONFIG_THERMAL=y
CONFIG_THERMAL_EMULATION=y
CONFIG_EXYNOS_THERMAL=y
+CONFIG_WATCHDOG=y
+CONFIG_RENESAS_WDT=y
CONFIG_MFD_SPMI_PMIC=y
CONFIG_MFD_SEC_CORE=y
CONFIG_MFD_HI655X_PMIC=y