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 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
[sfrench/cifs-2.6.git]
/
arch
/
arm64
/
Kconfig.platforms
diff --git
a/arch/arm64/Kconfig.platforms
b/arch/arm64/Kconfig.platforms
index cd58f8495c4580020167f97c142fdbb78466c0c3..d235b27cf372c2b9e18a080b4f6b3ea17ba2c19c 100644
(file)
--- a/
arch/arm64/Kconfig.platforms
+++ b/
arch/arm64/Kconfig.platforms
@@
-80,7
+80,6
@@
config ARCH_EXYNOS
select EXYNOS_CHIPID
select EXYNOS_PM_DOMAINS if PM_GENERIC_DOMAINS
select EXYNOS_PMU
- select HAVE_S3C2410_WATCHDOG if WATCHDOG
select HAVE_S3C_RTC if RTC_CLASS
select PINCTRL
select PINCTRL_EXYNOS