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

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

diff --git a/include/asm-ia64/pci.h b/include/asm-ia64/pci.h
index 0c4c5d801d3f8d3893ca02057d960f3fadc54c96..f11771eadc48ea95cb6d9f66c721b738cd7f24f3 100644 (file)
--- a/include/asm-ia64/pci.h
+++ b/include/asm-ia64/pci.h
@@ -47,7 +47,7 @@ pcibios_set_master (struct pci_dev *dev)
 }
 
 static inline void
-pcibios_penalize_isa_irq (int irq)
+pcibios_penalize_isa_irq (int irq, int active)
 {
        /* We don't do dynamic PCI IRQ allocation */
 }