From f1c045563efcd6b806a95f084b58f10209a44657 Mon Sep 17 00:00:00 2001
From: "Michael S. Tsirkin" <mst@redhat.com>
Date: Thu, 24 Nov 2011 21:10:12 +0200
Subject: [PATCH] --- yaml --- r: 283203 b: refs/heads/master c:
 eab90291d35438bcebf7c3dc85be66d0f24e3002 h: refs/heads/master i:   283201:
 9feaae6a14c505341158a0568833487565dd7c44   283199:
 1b887748f1573f9f412efdfbbe31819d0a6c4006 v: v3

---
 [refs]                          |  2 +-
 trunk/arch/mips/Kconfig         |  1 +
 trunk/arch/mips/lib/iomap-pci.c | 26 --------------------------
 3 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/[refs] b/[refs]
index 6936527a6ed3..7b66d0440b4d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b34d16073430671513b5231fb81cbe725b1a0de
+refs/heads/master: eab90291d35438bcebf7c3dc85be66d0f24e3002
diff --git a/trunk/arch/mips/Kconfig b/trunk/arch/mips/Kconfig
index d46f1da18a3c..b70c96f4417e 100644
--- a/trunk/arch/mips/Kconfig
+++ b/trunk/arch/mips/Kconfig
@@ -2317,6 +2317,7 @@ config PCI
 	bool "Support for PCI controller"
 	depends on HW_HAS_PCI
 	select PCI_DOMAINS
+	select GENERIC_PCI_IOMAP
 	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/mips/lib/iomap-pci.c b/trunk/arch/mips/lib/iomap-pci.c
index 2ab899c4b4ce..2635b1a96333 100644
--- a/trunk/arch/mips/lib/iomap-pci.c
+++ b/trunk/arch/mips/lib/iomap-pci.c
@@ -40,32 +40,6 @@ static void __iomem *ioport_map_pci(struct pci_dev *dev,
 	return (void __iomem *) (ctrl->io_map_base + port);
 }
 
-/*
- * Create a virtual mapping cookie for a PCI BAR (memory or IO)
- */
-void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
-{
-	resource_size_t start = pci_resource_start(dev, bar);
-	resource_size_t len = pci_resource_len(dev, bar);
-	unsigned long flags = pci_resource_flags(dev, bar);
-
-	if (!len || !start)
-		return NULL;
-	if (maxlen && len > maxlen)
-		len = maxlen;
-	if (flags & IORESOURCE_IO)
-		return ioport_map_pci(dev, start, len);
-	if (flags & IORESOURCE_MEM) {
-		if (flags & IORESOURCE_CACHEABLE)
-			return ioremap(start, len);
-		return ioremap_nocache(start, len);
-	}
-	/* What? */
-	return NULL;
-}
-
-EXPORT_SYMBOL(pci_iomap);
-
 void pci_iounmap(struct pci_dev *dev, void __iomem * addr)
 {
 	iounmap(addr);