Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...

[deliverable/linux.git] / include / asm-h8300 / pci.h

diff --git a/include/asm-h8300/pci.h b/include/asm-h8300/pci.h
index d032729b19df40aa62717dbb99146ee0e0b37ff6..5edad5b70fd56dcf45c79a7b852b73d005d8ed4a 100644 (file)
--- a/include/asm-h8300/pci.h
+++ b/include/asm-h8300/pci.h
@@ -15,7 +15,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 */
 }