diff options
| author | Tony Luck | 2005-07-13 21:15:43 +0200 |
|---|---|---|
| committer | Tony Luck | 2005-07-13 21:15:43 +0200 |
| commit | 99ad25a313bda566a346b46a6015afa65bc0a02b (patch) | |
| tree | b9443fed1ab74f320c4ee0791864ee96d7c069df /include/asm-ia64/pci.h | |
| parent | [IA64] Make PCDP work again. (diff) | |
| parent | [PATCH] inotify: misc cleanup (diff) | |
| download | kernel-qcow2-linux-99ad25a313bda566a346b46a6015afa65bc0a02b.tar.gz kernel-qcow2-linux-99ad25a313bda566a346b46a6015afa65bc0a02b.tar.xz kernel-qcow2-linux-99ad25a313bda566a346b46a6015afa65bc0a02b.zip | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'include/asm-ia64/pci.h')
| -rw-r--r-- | include/asm-ia64/pci.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-ia64/pci.h b/include/asm-ia64/pci.h index 8b7237cc84c1..dba9f220be71 100644 --- 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 */ } |