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-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-mvebu
/
Kconfig
diff --git
a/arch/arm/mach-mvebu/Kconfig
b/arch/arm/mach-mvebu/Kconfig
index 541647f5719255cfd755a22b0435f97426e92612..9b49867154bfba3f3a2a5d589219c48fd381669a 100644
(file)
--- a/
arch/arm/mach-mvebu/Kconfig
+++ b/
arch/arm/mach-mvebu/Kconfig
@@
-60,6
+60,8
@@
config MACH_ARMADA_38X
select ARM_ERRATA_720789
select ARM_ERRATA_753970
select ARM_GIC
+ select ARM_GLOBAL_TIMER
+ select CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK
select ARMADA_370_XP_IRQ
select ARMADA_38X_CLK
select HAVE_ARM_SCU