---

yaml --- r: 312121 b: refs/heads/master c: c5de50d h: refs/heads/master i: 312119: 8afdd40 v: v3
git-mirror · Jul 19, 2012 · d354200 · d354200
1 parent a776b4c
commit d354200
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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;