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 'virt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-omap2
/
Kconfig
diff --git
a/arch/arm/mach-omap2/Kconfig
b/arch/arm/mach-omap2/Kconfig
index 22ad24e9496b9d49a8a92a943be6043fc6583aaa..49ac3dfebef90b15d7d1da6e15f06e2807bc9cc1 100644
(file)
--- a/
arch/arm/mach-omap2/Kconfig
+++ b/
arch/arm/mach-omap2/Kconfig
@@
-99,12
+99,12
@@
config ARCH_OMAP4
config SOC_OMAP5
bool "TI OMAP5"
- select ARM_ARCH_TIMER
select ARM_CPU_SUSPEND if PM
select ARM_GIC
select CPU_V7
select HAVE_SMP
select COMMON_CLK
+ select HAVE_ARM_ARCH_TIMER
comment "OMAP Core Type"
depends on ARCH_OMAP2