3 files changed, 11 insertions, 11 deletions

diff --git a/arch/mips/pci/fixup-jmr3927.c b/arch/mips/pci/fixup-jmr3927.c
index f8696081c5b1..6e72d213f4cd 100644
--- a/arch/mips/pci/fixup-jmr3927.c
+++ b/arch/mips/pci/fixup-jmr3927.c
@@ -38,6 +38,10 @@ int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 {
         unsigned char irq = pin;
 
+        /* SMSC SLC90E66 IDE uses irq 14, 15 (default) */
+        if (dev->vendor == PCI_VENDOR_ID_EFAR &&
+            dev->device == PCI_DEVICE_ID_EFAR_SLC90E66_1)
+                return irq;
         /* IRQ rotation (PICMG) */
         irq--;                  /* 0-3 */
         if (dev->bus->parent == NULL &&
@@ -93,13 +97,3 @@ int pcibios_plat_dev_init(struct pci_dev *dev)
 {
         return 0;
 }
-
-int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
-{
-        /* SMSC SLC90E66 IDE uses irq 14, 15 (default) */
-        if (!(dev->vendor == PCI_VENDOR_ID_EFAR &&
-              dev->device == PCI_DEVICE_ID_EFAR_SLC90E66_1))
-                return pci_get_irq(dev, pin);
-
-        dev->irq = irq;
-}
diff --git a/arch/mips/pci/fixup-sni.c b/arch/mips/pci/fixup-sni.c
index 0c9a4732d455..36e5fb1b3786 100644
--- a/arch/mips/pci/fixup-sni.c
+++ b/arch/mips/pci/fixup-sni.c
@@ -14,6 +14,8 @@
 #include <asm/mipsregs.h>
 #include <asm/sni.h>
 
+#include <irq.h>
+
 /*
  * PCIMT Shortcuts ...
  */
diff --git a/arch/mips/pci/ops-au1000.c b/arch/mips/pci/ops-au1000.c
index 8ae46481fcb7..7932dfe5eb9b 100644
--- a/arch/mips/pci/ops-au1000.c
+++ b/arch/mips/pci/ops-au1000.c
@@ -172,7 +172,11 @@ static int config_access(unsigned char access_type, struct pci_bus *bus,
                 error = -1;
                 DBG("Au1x Master Abort\n");
         } else if ((status >> 28) & 0xf) {
-                DBG("PCI ERR detected: status %x\n", status);
+                DBG("PCI ERR detected: device %d, status %x\n", device, ((status >> 28) & 0xf));
+
+                /* clear errors */
+                au_writel(status & 0xf000ffff, Au1500_PCI_STATCMD);
+
                 *data = 0xffffffff;
                 error = -1;
         }