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 git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap1
/
Kconfig
diff --git
a/arch/arm/mach-omap1/Kconfig
b/arch/arm/mach-omap1/Kconfig
index
8d2f2da
..
e0a0281
100644
(file)
--- a/
arch/arm/mach-omap1/Kconfig
+++ b/
arch/arm/mach-omap1/Kconfig
@@
-9,6
+9,7
@@
config ARCH_OMAP730
depends on ARCH_OMAP1
bool "OMAP730 Based System"
select CPU_ARM926T
depends on ARCH_OMAP1
bool "OMAP730 Based System"
select CPU_ARM926T
+ select OMAP_MPU_TIMER
select ARCH_OMAP_OTG
config ARCH_OMAP850
select ARCH_OMAP_OTG
config ARCH_OMAP850
@@
-22,6
+23,7
@@
config ARCH_OMAP15XX
default y
bool "OMAP15xx Based System"
select CPU_ARM925T
default y
bool "OMAP15xx Based System"
select CPU_ARM925T
+ select OMAP_MPU_TIMER
config ARCH_OMAP16XX
depends on ARCH_OMAP1
config ARCH_OMAP16XX
depends on ARCH_OMAP1