diff options
author | 2005-07-12 16:04:50 -0700 | |
---|---|---|
committer | 2005-07-12 16:04:50 -0700 | |
commit | 3f603ed319d5120e883e64ac5967b2fc848fc43b (patch) | |
tree | 52ef311c245e4e4cd623b546ea1daf05a5ea8911 /include/asm-alpha | |
parent | [PATCH] v4l: broken hybrid dvb inclusion (diff) | |
parent | [ACPI] merge acpi-2.6.12 branch into latest Linux 2.6.13-rc... (diff) | |
download | linux-3f603ed319d5120e883e64ac5967b2fc848fc43b.tar.gz linux-3f603ed319d5120e883e64ac5967b2fc848fc43b.tar.bz2 linux-3f603ed319d5120e883e64ac5967b2fc848fc43b.zip |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/linux-2.6
Diffstat (limited to 'include/asm-alpha')
-rw-r--r-- | include/asm-alpha/pci.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-alpha/pci.h b/include/asm-alpha/pci.h index b7806aa3785c..28957697e59c 100644 --- a/include/asm-alpha/pci.h +++ b/include/asm-alpha/pci.h @@ -58,7 +58,7 @@ struct pci_controller { extern void pcibios_set_master(struct pci_dev *dev); -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 */ } |