From 4e095579b0770babfb7ad8e7c59c04a1e805c53d Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Thu, 20 Dec 2007 14:54:48 +1100
Subject: [PATCH] --- yaml --- r: 81113 b: refs/heads/master c:
 853ad6c2e752215237e7fb26d681ed0008dd081a h: refs/heads/master i:   81111:
 6439f55dfeaeeabb0d8551ad6eac98004eab144e v: v3

---
 [refs]                             |  2 +-
 trunk/arch/powerpc/kernel/pci_32.c | 11 -----------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index d2a2e5d24a4a..0708ab77043a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc3fb71c3e1850a6a1099dd1cb7bcd7e69ac7b73
+refs/heads/master: 853ad6c2e752215237e7fb26d681ed0008dd081a
diff --git a/trunk/arch/powerpc/kernel/pci_32.c b/trunk/arch/powerpc/kernel/pci_32.c
index beb6f0447d16..9a79a3d700ba 100644
--- a/trunk/arch/powerpc/kernel/pci_32.c
+++ b/trunk/arch/powerpc/kernel/pci_32.c
@@ -922,17 +922,6 @@ long sys_pciconfig_iobase(long which, unsigned long bus, unsigned long devfn)
 	struct pci_controller* hose;
 	long result = -EOPNOTSUPP;
 
-	/* Argh ! Please forgive me for that hack, but that's the
-	 * simplest way to get existing XFree to not lockup on some
-	 * G5 machines... So when something asks for bus 0 io base
-	 * (bus 0 is HT root), we return the AGP one instead.
-	 */
-#ifdef CONFIG_PPC_PMAC
-	if (machine_is(powermac) && machine_is_compatible("MacRISC4"))
-		if (bus == 0)
-			bus = 0xf0;
-#endif /* CONFIG_PPC_PMAC */
-
 	hose = pci_bus_to_hose(bus);
 	if (!hose)
 		return -ENODEV;