Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/cpupowerutils

[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 7cc7414..13cf518 100644 (file)
--- a/arch/arm/mach-pxa/cm-x2xx.c
+++ b/arch/arm/mach-pxa/cm-x2xx.c
@@ -517,6 +517,11 @@ MACHINE_START(ARMCORE, "Compulab CM-X2XX")
        .map_io         = cmx2xx_map_io,
        .nr_irqs        = CMX2XX_NR_IRQS,
        .init_irq       = cmx2xx_init_irq,
+       /* NOTE: pxa25x_handle_irq() works on PXA27x w/o camera support */
+       .handle_irq     = pxa25x_handle_irq,
        .timer          = &pxa_timer,
        .init_machine   = cmx2xx_init,
+#ifdef CONFIG_PCI
+       .dma_zone_size  = SZ_64M,
+#endif
 MACHINE_END