From 6505319f15a83fab6dd1965036a89c367fd5a4f6 Mon Sep 17 00:00:00 2001
From: "Michael S. Tsirkin" <mst@redhat.com>
Date: Mon, 30 Jan 2012 00:29:10 +0200
Subject: [PATCH] --- yaml --- r: 287295 b: refs/heads/master c:
 1e05b62ae4bd4c1209229de367b0989b39644f88 h: refs/heads/master i:   287293:
 e8999bc17ccbeef5a6352691d5a2272fefc1cd72   287291:
 7a986772481add40b58787b0be0e5983c6f0401f   287287:
 ed4111d0230f6c95c7146192a84a20789abd7c65   287279:
 dfc93abe0145faede58e47f156d0eae53adec84e   287263:
 6b7b7882908ac1364dc5afcfe31623144bd5b737   287231:
 f7cbedc50c0c7729ace3863293236b3a11d7b3aa v: v3

---
 [refs]                          | 2 +-
 trunk/arch/sh/Kconfig           | 1 +
 trunk/arch/sh/drivers/pci/pci.c | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 2fb7e768aac9..ad2c180a9d4f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0f3b3956c4946a6a991974943e3de33ae3d2523f
+refs/heads/master: 1e05b62ae4bd4c1209229de367b0989b39644f88
diff --git a/trunk/arch/sh/Kconfig b/trunk/arch/sh/Kconfig
index 3c8db65c89e5..713fb58ca507 100644
--- a/trunk/arch/sh/Kconfig
+++ b/trunk/arch/sh/Kconfig
@@ -859,6 +859,7 @@ config PCI
 	depends on SYS_SUPPORTS_PCI
 	select PCI_DOMAINS
 	select GENERIC_PCI_IOMAP
+	select NO_GENERIC_PCI_IOPORT_MAP
 	help
 	  Find out whether you have a PCI motherboard. PCI is the name of a
 	  bus system, i.e. the way the CPU talks to the other stuff inside
diff --git a/trunk/arch/sh/drivers/pci/pci.c b/trunk/arch/sh/drivers/pci/pci.c
index 8f18dd090a66..1e7b0e2e764d 100644
--- a/trunk/arch/sh/drivers/pci/pci.c
+++ b/trunk/arch/sh/drivers/pci/pci.c
@@ -356,8 +356,8 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
 
 #ifndef CONFIG_GENERIC_IOMAP
 
-static void __iomem *ioport_map_pci(struct pci_dev *dev,
-				    unsigned long port, unsigned int nr)
+void __iomem *__pci_ioport_map(struct pci_dev *dev,
+			       unsigned long port, unsigned int nr)
 {
 	struct pci_channel *chan = dev->sysdata;