Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[linux-2.6-omap-h63xx.git] / arch / mips / pci / fixup-atlas.c

diff --git a/arch/mips/pci/fixup-atlas.c b/arch/mips/pci/fixup-atlas.c
index 87920b245931bc1571f54a1021955e2dd19668f5..45224fd2c7babf3ff4303eebfb5a02479ff9befb 100644 (file)
--- a/arch/mips/pci/fixup-atlas.c
+++ b/arch/mips/pci/fixup-atlas.c
@@ -16,22 +16,21 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
  */
-#include <linux/config.h>
 #include <linux/init.h>
 #include <linux/pci.h>
 
 #include <asm/mips-boards/atlasint.h>
 
-#define PCIA           ATLASINT_PCIA
-#define PCIB           ATLASINT_PCIB
-#define PCIC           ATLASINT_PCIC
-#define PCID           ATLASINT_PCID
-#define INTA           ATLASINT_INTA
-#define INTB           ATLASINT_INTB
-#define ETH            ATLASINT_ETH
-#define INTC           ATLASINT_INTC
-#define SCSI           ATLASINT_SCSI
-#define INTD           ATLASINT_INTD
+#define PCIA           ATLAS_INT_PCIA
+#define PCIB           ATLAS_INT_PCIB
+#define PCIC           ATLAS_INT_PCIC
+#define PCID           ATLAS_INT_PCID
+#define INTA           ATLAS_INT_INTA
+#define INTB           ATLAS_INT_INTB
+#define ETH            ATLAS_INT_ETH
+#define INTC           ATLAS_INT_INTC
+#define SCSI           ATLAS_INT_SCSI
+#define INTD           ATLAS_INT_INTD
 
 static char irq_tab[][5] __initdata = {
        /*      INTA    INTB    INTC    INTD */
@@ -59,7 +58,7 @@ static char irq_tab[][5] __initdata = {
        {0,     0,      0,      0,      0 }     /* 21: Unused */
 };
 
-int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 {
        return irq_tab[slot][pin];
 }