Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / sh / drivers / pci / pci.c

diff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c
index 60ee09a4e1215d14225c9280e5e5f79f0e68a3af..a09c77dd09db7c252b34da5f72f861bf4a413d1f 100644 (file)
--- a/arch/sh/drivers/pci/pci.c
+++ b/arch/sh/drivers/pci/pci.c
@@ -382,14 +382,13 @@ static void __iomem *ioport_map_pci(struct pci_dev *dev,
        struct pci_channel *chan = dev->sysdata;
 
        if (unlikely(!chan->io_map_base)) {
-               chan->io_map_base = generic_io_base;
+               chan->io_map_base = sh_io_port_base;
 
                if (pci_domains_supported)
                        panic("To avoid data corruption io_map_base MUST be "
                              "set with multiple PCI domains.");
        }
 
-
        return (void __iomem *)(chan->io_map_base + port);
 }