diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-12 19:04:50 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-12 19:04:50 -0400 |
| commit | 3f603ed319d5120e883e64ac5967b2fc848fc43b (patch) | |
| tree | 52ef311c245e4e4cd623b546ea1daf05a5ea8911 /include/asm-alpha | |
| parent | 55ee3b8365fd5d301b9076eea739146f2b91e82c (diff) | |
| parent | 5028770a42e7bc4d15791a44c28f0ad539323807 (diff) | |
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 { | |||
| 58 | 58 | ||
| 59 | extern void pcibios_set_master(struct pci_dev *dev); | 59 | extern void pcibios_set_master(struct pci_dev *dev); |
| 60 | 60 | ||
| 61 | extern inline void pcibios_penalize_isa_irq(int irq) | 61 | extern inline void pcibios_penalize_isa_irq(int irq, int active) |
| 62 | { | 62 | { |
| 63 | /* We don't do dynamic PCI IRQ allocation */ | 63 | /* We don't do dynamic PCI IRQ allocation */ |
| 64 | } | 64 | } |