projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6
[cascardo/linux.git]
/
arch
/
arm
/
mach-integrator
/
Kconfig
diff --git
a/arch/arm/mach-integrator/Kconfig
b/arch/arm/mach-integrator/Kconfig
index
d701d32
..
dfd18f3
100644
(file)
--- a/
arch/arm/mach-integrator/Kconfig
+++ b/
arch/arm/mach-integrator/Kconfig
@@
-4,6
+4,7
@@
menu "Integrator Options"
config ARCH_INTEGRATOR_AP
bool "Support Integrator/AP and Integrator/PP2 platforms"
config ARCH_INTEGRATOR_AP
bool "Support Integrator/AP and Integrator/PP2 platforms"
+ select CLKSRC_MMIO
select MIGHT_HAVE_PCI
help
Include support for the ARM(R) Integrator/AP and
select MIGHT_HAVE_PCI
help
Include support for the ARM(R) Integrator/AP and