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

[linux-2.6] / include / asm-sparc / pci.h

diff --git a/include/asm-sparc/pci.h b/include/asm-sparc/pci.h
index 44bb38758c96964b51e9a925647d52e64b93a2fc..97052baf90c130f3757415bff91f6d732e151e4a 100644 (file)
--- a/include/asm-sparc/pci.h
+++ b/include/asm-sparc/pci.h
@@ -20,7 +20,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 */
 }