From 9d58c2e79a52e6ac2126f2ff9e8e9df18ec3f682 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Mon, 1 Dec 2008 14:30:30 -0800
Subject: [PATCH] --- yaml --- r: 127375 b: refs/heads/master c:
 1684f5ddd4c0c754f52c78eaa2c5c69ad09fb18c h: refs/heads/master i:   127373:
 5380a6a25aa49bd376baf62f4f509c67b21aea68   127371:
 a94e576198c751fcd9a4bc982c3613a4f1e99d2b   127367:
 57ab6d9c5c952371dcd190a5113552ce130a3ab2   127359:
 3da4efa3c396747c21ef2c31429e4f8f7fe4bce2 v: v3

---
 [refs]                    |  2 +-
 trunk/drivers/pci/pci.c   | 16 ++++++++++++++++
 trunk/include/linux/pci.h | 15 +--------------
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 4f186c70d42d..3ae1b50150e6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bebd590ca27e80ffe3129ab4f0a3124f0a340f43
+refs/heads/master: 1684f5ddd4c0c754f52c78eaa2c5c69ad09fb18c
diff --git a/trunk/drivers/pci/pci.c b/trunk/drivers/pci/pci.c
index 1fb7cff4cdae..9354dd63f035 100644
--- a/trunk/drivers/pci/pci.c
+++ b/trunk/drivers/pci/pci.c
@@ -56,6 +56,22 @@ unsigned char pci_bus_max_busnr(struct pci_bus* bus)
 }
 EXPORT_SYMBOL_GPL(pci_bus_max_busnr);
 
+#ifdef CONFIG_HAS_IOMEM
+void __iomem *pci_ioremap_bar(struct pci_dev *pdev, int bar)
+{
+	/*
+	 * Make sure the BAR is actually a memory resource, not an IO resource
+	 */
+	if (!(pci_resource_flags(pdev, bar) & IORESOURCE_MEM)) {
+		WARN_ON(1);
+		return NULL;
+	}
+	return ioremap_nocache(pci_resource_start(pdev, bar),
+				     pci_resource_len(pdev, bar));
+}
+EXPORT_SYMBOL_GPL(pci_ioremap_bar);
+#endif
+
 #if 0
 /**
  * pci_max_busnr - returns maximum PCI bus number
diff --git a/trunk/include/linux/pci.h b/trunk/include/linux/pci.h
index 58357d14f94c..0d8bc920c2e5 100644
--- a/trunk/include/linux/pci.h
+++ b/trunk/include/linux/pci.h
@@ -1160,20 +1160,7 @@ static inline void pci_mmcfg_late_init(void) { }
 
 int pci_ext_cfg_avail(struct pci_dev *dev);
 
-#ifdef CONFIG_HAS_IOMEM
-static inline void __iomem *pci_ioremap_bar(struct pci_dev *pdev, int bar)
-{
-	/*
-	 * Make sure the BAR is actually a memory resource, not an IO resource
-	 */
-	if (!(pci_resource_flags(pdev, bar) & IORESOURCE_MEM)) {
-		WARN_ON(1);
-		return NULL;
-	}
-	return ioremap_nocache(pci_resource_start(pdev, bar),
-				     pci_resource_len(pdev, bar));
-}
-#endif
+void __iomem *pci_ioremap_bar(struct pci_dev *pdev, int bar);
 
 #endif /* __KERNEL__ */
 #endif /* LINUX_PCI_H */