Auto merge with /home/aegl/GIT/linus

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

diff --git a/include/asm-ia64/pci.h b/include/asm-ia64/pci.h
index 8b7237cc84c17d55c01ac12af9dbd2f9fb8016ab..dba9f220be715b7273f474de70fa1e8338576d44 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
 }
 
 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 */
 }
 {
        /* We don't do dynamic PCI IRQ allocation */
 }