From a08bf221bba32487ac6503e4130f143dfb4a6dcc Mon Sep 17 00:00:00 2001
From: Kumar Gala <galak@kernel.crashing.org>
Date: Thu, 2 Oct 2008 00:58:49 -0500
Subject: [PATCH] --- yaml --- r: 110123 b: refs/heads/master c:
 1fce2d01dff65a76cd08c1b145acd9d3c20021d2 h: refs/heads/master i:   110121:
 7f8a023ed7537b103c7454524ab35380bab8886e   110119:
 0bf5909ec7d5a8766d864630a776762362418841 v: v3

---
 [refs]                                     |  2 +-
 trunk/arch/powerpc/platforms/fsl_uli1575.c | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 08d0c4c9c66d..e7e1ed9b6773 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a7703582836f55a1cbad0e2c1c6ebbee3f9b3a7
+refs/heads/master: 1fce2d01dff65a76cd08c1b145acd9d3c20021d2
diff --git a/trunk/arch/powerpc/platforms/fsl_uli1575.c b/trunk/arch/powerpc/platforms/fsl_uli1575.c
index ef74a0763ec1..8c619963becc 100644
--- a/trunk/arch/powerpc/platforms/fsl_uli1575.c
+++ b/trunk/arch/powerpc/platforms/fsl_uli1575.c
@@ -219,11 +219,21 @@ static void __devinit quirk_final_uli5249(struct pci_dev *dev)
 	int i;
 	u8 *dummy;
 	struct pci_bus *bus = dev->bus;
+	resource_size_t end = 0;
+
+	for (i = PCI_BRIDGE_RESOURCES; i < PCI_BRIDGE_RESOURCES+3; i++) {
+		unsigned long flags = pci_resource_flags(dev, i);
+		if ((flags & (IORESOURCE_MEM|IORESOURCE_PREFETCH)) == IORESOURCE_MEM)
+			end = pci_resource_end(dev, i);
+	}
 
 	for (i = 0; i < PCI_BUS_NUM_RESOURCES; i++) {
 		if ((bus->resource[i]) &&
 			(bus->resource[i]->flags & IORESOURCE_MEM)) {
-			dummy = ioremap(bus->resource[i]->end - 3, 0x4);
+			if (bus->resource[i]->end == end)
+				dummy = ioremap(bus->resource[i]->start, 0x4);
+			else
+				dummy = ioremap(bus->resource[i]->end - 3, 0x4);
 			if (dummy) {
 				in_8(dummy);
 				iounmap(dummy);