diff options
author | Tony Luck <tony.luck@intel.com> | 2005-07-13 12:15:43 -0700 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-07-13 12:15:43 -0700 |
commit | 99ad25a313bda566a346b46a6015afa65bc0a02b (patch) | |
tree | b9443fed1ab74f320c4ee0791864ee96d7c069df /include/asm-ia64/pci.h | |
parent | f62c4a96f74d6c6dd56d1742697e94a5c2085e87 (diff) | |
parent | 9a556e89081b0c1c2f83cee915363b15a68a6f2d (diff) | |
download | linux-99ad25a313bda566a346b46a6015afa65bc0a02b.tar.bz2 |
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 */ } |