From d354200bef1a68d4a596ae7558842d25295c9460 Mon Sep 17 00:00:00 2001
From: "Steven J. Hill" <sjhill@mips.com>
Date: Thu, 19 Jul 2012 09:11:14 +0200
Subject: [PATCH] --- yaml --- r: 312121 b: refs/heads/master c:
 c5de50dada1403e1abc8cd4a8c9a1283c859e0bb h: refs/heads/master i:   312119:
 8afdd403ee03f2fe62d2d660a72d3d23a418142c v: v3

---
 [refs]                                | 2 +-
 trunk/arch/mips/mti-malta/malta-pci.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 519694be6c92..329ffac46038 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2dd17030c940ef1199a07b095ec79c4660fa8734
+refs/heads/master: c5de50dada1403e1abc8cd4a8c9a1283c859e0bb
diff --git a/trunk/arch/mips/mti-malta/malta-pci.c b/trunk/arch/mips/mti-malta/malta-pci.c
index bf80921f2f56..916206823d45 100644
--- a/trunk/arch/mips/mti-malta/malta-pci.c
+++ b/trunk/arch/mips/mti-malta/malta-pci.c
@@ -241,8 +241,9 @@ void __init mips_pcibios_init(void)
 		return;
 	}
 
-	if (controller->io_resource->start < 0x00001000UL)	/* FIXME */
-		controller->io_resource->start = 0x00001000UL;
+	/* Change start address to avoid conflicts with ACPI and SMB devices */
+	if (controller->io_resource->start < 0x00002000UL)
+		controller->io_resource->start = 0x00002000UL;
 
 	iomem_resource.end &= 0xfffffffffULL;			/* 64 GB */
 	ioport_resource.end = controller->io_resource->end;