From 056699cc00daef628748b2ecc4861671954aef44 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 7 Dec 2005 13:01:05 +1100
Subject: [PATCH] --- yaml --- r: 17167 b: refs/heads/master c:
 d4e4b3520c4df46cf1d15a56379a6fa57e267b7d h: refs/heads/master i:   17165:
 a26d9c3d443ac0992f9b3db261df868cdc9f4f53   17163:
 e692200ee70a0a82e9f266ee78980ba6a8add8d0   17159:
 ad806919c61dcab80dcddaa275375c58ea9dbe24   17151:
 d24555949da80b23b1c5947ef23ada688c5f3b98 v: v3

---
 [refs]                             |  2 +-
 trunk/arch/powerpc/kernel/pci_64.c | 28 ++++++++++++++--------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index d03c884aa07d..3161249e6e7e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e07102db63d10d9f9d94d21dfdb1178e65154b9e
+refs/heads/master: d4e4b3520c4df46cf1d15a56379a6fa57e267b7d
diff --git a/trunk/arch/powerpc/kernel/pci_64.c b/trunk/arch/powerpc/kernel/pci_64.c
index 0988222741f0..4eb93fc1eef2 100644
--- a/trunk/arch/powerpc/kernel/pci_64.c
+++ b/trunk/arch/powerpc/kernel/pci_64.c
@@ -1181,20 +1181,6 @@ void phbs_remap_io(void)
 		remap_bus_range(hose->bus);
 }
 
-unsigned int pci_address_to_pio(phys_addr_t address)
-{
-	struct pci_controller *hose, *tmp;
-
-	list_for_each_entry_safe(hose, tmp, &hose_list, list_node) {
-		if (address >= hose->io_base_phys &&
-		    address < (hose->io_base_phys + hose->pci_io_size))
-			return (unsigned int)hose->io_base_virt +
-				(address - hose->io_base_phys);
-	}
-	return (unsigned int)-1;
-}
-EXPORT_SYMBOL_GPL(pci_address_to_pio);
-
 static void __devinit fixup_resource(struct resource *res, struct pci_dev *dev)
 {
 	struct pci_controller *hose = pci_bus_to_host(dev->bus);
@@ -1337,6 +1323,20 @@ struct pci_controller* pci_find_hose_for_OF_device(struct device_node* node)
 
 #endif /* CONFIG_PPC_MULTIPLATFORM */
 
+unsigned int pci_address_to_pio(phys_addr_t address)
+{
+	struct pci_controller *hose, *tmp;
+
+	list_for_each_entry_safe(hose, tmp, &hose_list, list_node) {
+		if (address >= hose->io_base_phys &&
+		    address < (hose->io_base_phys + hose->pci_io_size))
+			return (unsigned int)hose->io_base_virt +
+				(address - hose->io_base_phys);
+	}
+	return (unsigned int)-1;
+}
+EXPORT_SYMBOL_GPL(pci_address_to_pio);
+
 
 #define IOBASE_BRIDGE_NUMBER	0
 #define IOBASE_MEMORY		1