projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'mmc-updates-for-3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel...
[cascardo/linux.git]
/
arch
/
arm
/
mach-ux500
/
Kconfig
diff --git
a/arch/arm/mach-ux500/Kconfig
b/arch/arm/mach-ux500/Kconfig
index
b19b072
..
99a28d6
100644
(file)
--- a/
arch/arm/mach-ux500/Kconfig
+++ b/
arch/arm/mach-ux500/Kconfig
@@
-8,7
+8,7
@@
config ARCH_U8500
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 MIGHT_HAVE_CACHE_L2X0
help