From 2b101203e6bc7fb3f281a8afa0302db39234597e Mon Sep 17 00:00:00 2001
From: "Michael S. Tsirkin" <mst@redhat.com>
Date: Thu, 24 Nov 2011 21:06:41 +0200
Subject: [PATCH] --- yaml --- r: 283202 b: refs/heads/master c:
 1b34d16073430671513b5231fb81cbe725b1a0de h: refs/heads/master v: v3

---
 [refs]                            |  2 +-
 trunk/arch/microblaze/Kconfig     |  1 +
 trunk/arch/microblaze/pci/iomap.c | 19 -------------------
 3 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/[refs] b/[refs]
index ef1f9f4c1831..6936527a6ed3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e5bfb72ce2ce558b5a5a46cc5694001f0479c7f2
+refs/heads/master: 1b34d16073430671513b5231fb81cbe725b1a0de
diff --git a/trunk/arch/microblaze/Kconfig b/trunk/arch/microblaze/Kconfig
index e446bab2427b..f0eead74fff6 100644
--- a/trunk/arch/microblaze/Kconfig
+++ b/trunk/arch/microblaze/Kconfig
@@ -17,6 +17,7 @@ config MICROBLAZE
 	select HAVE_GENERIC_HARDIRQS
 	select GENERIC_IRQ_PROBE
 	select GENERIC_IRQ_SHOW
+	select GENERIC_PCI_IOMAP
 
 config SWAP
 	def_bool n
diff --git a/trunk/arch/microblaze/pci/iomap.c b/trunk/arch/microblaze/pci/iomap.c
index 57acda852f5a..b07abbac0319 100644
--- a/trunk/arch/microblaze/pci/iomap.c
+++ b/trunk/arch/microblaze/pci/iomap.c
@@ -10,25 +10,6 @@
 #include <asm/io.h>
 #include <asm/pci-bridge.h>
 
-void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max)
-{
-	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)
-		return NULL;
-	if (max && len > max)
-		len = max;
-	if (flags & IORESOURCE_IO)
-		return ioport_map(start, len);
-	if (flags & IORESOURCE_MEM)
-		return ioremap(start, len);
-	/* What? */
-	return NULL;
-}
-EXPORT_SYMBOL(pci_iomap);
-
 void pci_iounmap(struct pci_dev *dev, void __iomem *addr)
 {
 	if (isa_vaddr_is_ioport(addr))