Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into rmobile-latest

Conflicts:
	arch/arm/mach-shmobile/Kconfig

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

1 files changed, 1 insertions, 2 deletions

diff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c
index 60ee09a4e121..a09c77dd09db 100644
--- 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);
 }