Merge commit 'v2.6.26-rc9' into x86/cpu

1 files changed, 5 insertions, 3 deletions

diff --git a/arch/mips/pci/pci-sb1250.c b/arch/mips/pci/pci-sb1250.c
index 42e4d2c800fa..2a09ad91ec8c 100644
--- a/arch/mips/pci/pci-sb1250.c
+++ b/arch/mips/pci/pci-sb1250.c
@@ -207,6 +207,7 @@ struct pci_controller sb1250_controller = {
 
 static int __init sb1250_pcibios_init(void)
 {
+        void __iomem *io_map_base;
         uint32_t cmdreg;
         uint64_t reg;
         extern int pci_probe_only;
@@ -253,12 +254,13 @@ static int __init sb1250_pcibios_init(void)
          * works correctly with most of Linux's drivers.
          * XXX ehs: Should this happen in PCI Device mode?
          */
-
-        set_io_port_base((unsigned long)
-                         ioremap(A_PHYS_LDTPCI_IO_MATCH_BYTES, 65536));
         isa_slot_offset = (unsigned long)
             ioremap(A_PHYS_LDTPCI_IO_MATCH_BYTES_32, 1024 * 1024);
 
+        io_map_base = ioremap(A_PHYS_LDTPCI_IO_MATCH_BYTES, 1024 * 1024);
+        sb1250_controller.io_map_base = io_map_base;
+        set_io_port_base((unsigned long)io_map_base);
+
 #ifdef CONFIG_SIBYTE_HAS_LDT
         /*
          * Also check the LDT bridge's enable, just in case we didn't