---

yaml --- r: 287295 b: refs/heads/master c: 1e05b62 h: refs/heads/master i: 287293: e8999bc 287291: 7a98677 287287: ed4111d 287279: dfc93ab 287263: 6b7b788 287231: f7cbedc v: v3
git-mirror · Jan 31, 2012 · 6505319 · 6505319
1 parent 8b8e997
commit 6505319
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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;