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 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
cm-x2xx.c
diff --git
a/arch/arm/mach-pxa/cm-x2xx.c
b/arch/arm/mach-pxa/cm-x2xx.c
index
a109967
..
bc55d07
100644
(file)
--- a/
arch/arm/mach-pxa/cm-x2xx.c
+++ b/
arch/arm/mach-pxa/cm-x2xx.c
@@
-518,4
+518,7
@@
MACHINE_START(ARMCORE, "Compulab CM-X2XX")
.init_irq = cmx2xx_init_irq,
.timer = &pxa_timer,
.init_machine = cmx2xx_init,
+#ifdef CONFIG_PCI
+ .dma_zone_size = SZ_64M,
+#endif
MACHINE_END