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

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

diff --git a/include/asm-ppc/pci.h b/include/asm-ppc/pci.h
index db0a2a0ec74d9727ac724967271dd18ad7ab6cc1..a13d55870e62202b9045e80ac9e8b9ab7c2bb25a 100644 (file)
--- a/include/asm-ppc/pci.h
+++ b/include/asm-ppc/pci.h
@@ -37,7 +37,7 @@ extern inline void pcibios_set_master(struct pci_dev *dev)
        /* No special bus mastering setup handling */
 }
 
-extern inline void pcibios_penalize_isa_irq(int irq)
+extern inline void pcibios_penalize_isa_irq(int irq, int active)
 {
        /* We don't do dynamic PCI IRQ allocation */
 }