Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm...

[GitHub/mt8127/android_kernel_alcatel_ttab.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 1719927c24d63b575a50beed30746f922004ea24..13cf518bbbf85d253676dc6c3c72fef9b66c16e4 100644 (file)
--- a/arch/arm/mach-pxa/cm-x2xx.c
+++ b/arch/arm/mach-pxa/cm-x2xx.c
@@ -521,4 +521,7 @@ MACHINE_START(ARMCORE, "Compulab CM-X2XX")
        .handle_irq     = pxa25x_handle_irq,
        .timer          = &pxa_timer,
        .init_machine   = cmx2xx_init,
+#ifdef CONFIG_PCI
+       .dma_zone_size  = SZ_64M,
+#endif
 MACHINE_END