1 files changed, 4 insertions, 3 deletions

diff --git a/arch/mips/mti-malta/malta-pci.c b/arch/mips/mti-malta/malta-pci.c
index bf80921f2f56..284dea54faf5 100644
--- a/arch/mips/mti-malta/malta-pci.c
+++ b/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;
@@ -253,7 +254,7 @@ void __init mips_pcibios_init(void)
 }
 
 /* Enable PCI 2.1 compatibility in PIIX4 */
-static void __init quirk_dlcsetup(struct pci_dev *dev)
+static void __devinit quirk_dlcsetup(struct pci_dev *dev)
 {
         u8 odlc, ndlc;
         (void) pci_read_config_byte(dev, 0x82, &odlc);