projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'omap-for-v3.14/fixes-against-rc1' of git://git.kernel.org/pub/scm/linux...
[linux-2.6-microblaze.git]
/
arch
/
arm
/
mach-omap2
/
Kconfig
diff --git
a/arch/arm/mach-omap2/Kconfig
b/arch/arm/mach-omap2/Kconfig
index
9320252
..
0af7ca0
100644
(file)
--- a/
arch/arm/mach-omap2/Kconfig
+++ b/
arch/arm/mach-omap2/Kconfig
@@
-55,7
+55,7
@@
config SOC_OMAP5
select ARM_GIC
select CPU_V7
select HAVE_ARM_SCU if SMP
- select HAVE_ARM_TWD if
LOCAL_TIMERS
+ select HAVE_ARM_TWD if
SMP
select HAVE_SMP
select HAVE_ARM_ARCH_TIMER
select ARM_ERRATA_798181 if SMP