Merge branch 'master'

1 files changed, 3 insertions, 1 deletions

diff --git a/arch/mips/pci/pci-ip32.c b/arch/mips/pci/pci-ip32.c
index 000dc6af6cd3..180af89bcb1e 100644
--- a/arch/mips/pci/pci-ip32.c
+++ b/arch/mips/pci/pci-ip32.c
@@ -136,7 +136,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;