git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
arm
/
mach-shmobile
/
Kconfig
diff --git
a/arch/arm/mach-shmobile/Kconfig
b/arch/arm/mach-shmobile/Kconfig
index
c1a9538
..
f6db7dc
100644
(file)
--- a/
arch/arm/mach-shmobile/Kconfig
+++ b/
arch/arm/mach-shmobile/Kconfig
@@
-8,7
+8,7
@@
config ARCH_SHMOBILE_MULTI
select CPU_V7
select GENERIC_CLOCKEVENTS
select HAVE_ARM_SCU if SMP
- select HAVE_ARM_TWD if
LOCAL_TIMERS
+ select HAVE_ARM_TWD if
SMP
select HAVE_SMP
select ARM_GIC
select MIGHT_HAVE_CACHE_L2X0