Merge branch 'nfs-for-3.1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[pandora-kernel.git] / arch / arm / mach-pxa / cm-x2xx-pci.c

diff --git a/arch/arm/mach-pxa/cm-x2xx-pci.c b/arch/arm/mach-pxa/cm-x2xx-pci.c
index 8b1a309..4eb7660 100644 (file)
--- a/arch/arm/mach-pxa/cm-x2xx-pci.c
+++ b/arch/arm/mach-pxa/cm-x2xx-pci.c
@@ -29,33 +29,6 @@
 unsigned long it8152_base_address;
 static int cmx2xx_it8152_irq_gpio;
 
-/*
- * Only first 64MB of memory can be accessed via PCI.
- * We use GFP_DMA to allocate safe buffers to do map/unmap.
- * This is really ugly and we need a better way of specifying
- * DMA-capable regions of memory.
- */
-void __init cmx2xx_pci_adjust_zones(unsigned long *zone_size,
-       unsigned long *zhole_size)
-{
-       unsigned int sz = SZ_64M >> PAGE_SHIFT;
-
-       if (machine_is_armcore()) {
-               pr_info("Adjusting zones for CM-X2XX\n");
-
-               /*
-                * Only adjust if > 64M on current system
-                */
-               if (zone_size[0] <= sz)
-                       return;
-
-               zone_size[1] = zone_size[0] - sz;
-               zone_size[0] = sz;
-               zhole_size[1] = zhole_size[0];
-               zhole_size[0] = 0;
-       }
-}
-
 static void cmx2xx_it8152_irq_demux(unsigned int irq, struct irq_desc *desc)
 {
        /* clear our parent irq */
@@ -152,6 +125,9 @@ static void cmx2xx_pci_preinit(void)
 {
        pr_info("Initializing CM-X2XX PCI subsystem\n");
 
+       pcibios_min_io = 0;
+       pcibios_min_mem = 0;
+
        __raw_writel(0x800, IT8152_PCI_CFG_ADDR);
        if (__raw_readl(IT8152_PCI_CFG_DATA) == 0x81521283) {
                pr_info("PCI Bridge found.\n");