[ACPI] merge acpi-2.6.12 branch into latest Linux 2.6.13-rc...

[karo-tx-linux.git] / include / asm-mips / pci.h

diff --git a/include/asm-mips/pci.h b/include/asm-mips/pci.h
index 2d323b6e147d135e45cb626c504cb548e81e12b5..d70dc355c1f320bf6bdd5a2fb4542a93ff82a481 100644 (file)
--- a/include/asm-mips/pci.h
+++ b/include/asm-mips/pci.h
@@ -69,7 +69,7 @@ extern unsigned long PCIBIOS_MIN_MEM;
 
 extern void pcibios_set_master(struct pci_dev *dev);
 
-static inline void pcibios_penalize_isa_irq(int irq)
+static inline void pcibios_penalize_isa_irq(int irq, int active)
 {
        /* We don't do dynamic PCI IRQ allocation */
 }