Merge branch 'linus' into x86/urgent

[~andy/linux] / arch / mips / pci / fixup-fuloong2e.c

diff --git a/arch/mips/pci/fixup-fuloong2e.c b/arch/mips/pci/fixup-fuloong2e.c
index 0c4c7a81213f81b01dc24ac924320174a0064fa2..d5d4c018fb04c03f4ef6b1d26d05fd263ad4835e 100644 (file)
--- a/arch/mips/pci/fixup-fuloong2e.c
+++ b/arch/mips/pci/fixup-fuloong2e.c
@@ -13,7 +13,8 @@
  */
 #include <linux/init.h>
 #include <linux/pci.h>
-#include <asm/mips-boards/bonito64.h>
+
+#include <loongson.h>
 
 /* South bridge slot number is set by the pci probe process */
 static u8 sb_slot = 5;
@@ -35,7 +36,7 @@ int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
                        break;
                }
        } else {
-               irq = BONITO_IRQ_BASE + 25 + pin;
+               irq = LOONGSON_IRQ_BASE + 25 + pin;
        }
        return irq;
 
@@ -51,7 +52,7 @@ static void __init loongson2e_nec_fixup(struct pci_dev *pdev)
 {
        unsigned int val;
 
-       /* Configues port 1, 2, 3, 4 to be validate*/
+       /* Configures port 1, 2, 3, 4 to be validate*/
        pci_read_config_dword(pdev, 0xe0, &val);
        pci_write_config_dword(pdev, 0xe0, (val & ~7) | 0x4);