aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/cm-x2xx.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2011-07-25 17:22:29 +0900
committerPaul Mundt <lethal@linux-sh.org>2011-07-25 17:22:29 +0900
commitb79b3e05b1229d5b2fc2af71dc29701642577eba (patch)
treebcdf728ccfab02d66e129cacaa106bf8cc60f2d6 /arch/arm/mach-pxa/cm-x2xx.c
parentARM: static should be at beginning of declaration (diff)
parentARM: mach-shmobile: ag5evm: SDHI requires waiting for idle (diff)
downloadlinux-dev-b79b3e05b1229d5b2fc2af71dc29701642577eba.tar.xz
linux-dev-b79b3e05b1229d5b2fc2af71dc29701642577eba.zip
Merge branch 'rmobile/sdio' into rmobile-latest
Diffstat (limited to 'arch/arm/mach-pxa/cm-x2xx.c')
-rw-r--r--arch/arm/mach-pxa/cm-x2xx.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/cm-x2xx.c b/arch/arm/mach-pxa/cm-x2xx.c
index a10996782476..bc55d07566ca 100644
--- 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