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 'writeback' of git://git.kernel.dk/linux-2.6-block
[pandora-kernel.git]
/
arch
/
arm
/
Kconfig
diff --git
a/arch/arm/Kconfig
b/arch/arm/Kconfig
index
d778a69
..
1c4119c
100644
(file)
--- a/
arch/arm/Kconfig
+++ b/
arch/arm/Kconfig
@@
-46,6
+46,10
@@
config GENERIC_CLOCKEVENTS_BROADCAST
depends on GENERIC_CLOCKEVENTS
default y if SMP && !LOCAL_TIMERS
depends on GENERIC_CLOCKEVENTS
default y if SMP && !LOCAL_TIMERS
+config HAVE_TCM
+ bool
+ select GENERIC_ALLOCATOR
+
config NO_IOPORT
bool
config NO_IOPORT
bool
@@
-649,6
+653,7
@@
config ARCH_U300
bool "ST-Ericsson U300 Series"
depends on MMU
select CPU_ARM926T
bool "ST-Ericsson U300 Series"
depends on MMU
select CPU_ARM926T
+ select HAVE_TCM
select ARM_AMBA
select ARM_VIC
select GENERIC_TIME
select ARM_AMBA
select ARM_VIC
select GENERIC_TIME