Merge branch 'upstream' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into...

[mv-sheeva.git] / arch / mips / pci / pci-ip32.c

diff --git a/arch/mips/pci/pci-ip32.c b/arch/mips/pci/pci-ip32.c
index 000dc6af6cd39310d0bd940f0c766fc96326090c..17c7932cf0ae1775b89ab24584abfc4430d542c8 100644 (file)
--- a/arch/mips/pci/pci-ip32.c
+++ b/arch/mips/pci/pci-ip32.c
@@ -6,7 +6,6 @@
  * Copyright (C) 2000, 2001 Keith M Wesolowski
  * Copyright (C) 2004 by Ralf Baechle (ralf@linux-mips.org)
  */
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
@@ -136,7 +135,9 @@ static int __init mace_init(void)
        BUG_ON(request_irq(MACE_PCI_BRIDGE_IRQ, macepci_error, 0,
                           "MACE PCI error", NULL));
 
-       ioport_resource.end = mace_pci_io_resource.end;
+       iomem_resource = mace_pci_mem_resource;
+       ioport_resource = mace_pci_io_resource;
+
        register_pci_controller(&mace_pci_controller);
 
        return 0;