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 'hwspinlock-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-rockchip
/
Kconfig
diff --git
a/arch/arm/mach-rockchip/Kconfig
b/arch/arm/mach-rockchip/Kconfig
index e4564c259ed11b27ea656abf72638ae4d0c98ce9..d1686696ca41d00b3292d1d0bc70a7327acd73df 100644
(file)
--- a/
arch/arm/mach-rockchip/Kconfig
+++ b/
arch/arm/mach-rockchip/Kconfig
@@
-6,6
+6,7
@@
config ARCH_ROCKCHIP
select ARCH_REQUIRE_GPIOLIB
select ARM_GIC
select CACHE_L2X0
+ select HAVE_ARM_ARCH_TIMER
select HAVE_ARM_SCU if SMP
select HAVE_ARM_TWD if SMP
select DW_APB_TIMER_OF