diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-10 13:46:28 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-10 13:46:28 -0400 |
| commit | 2f058256cb64e346f4fb4499ff4e0f1c2791a4b4 (patch) | |
| tree | 91e06602f4d3abb6812ea8c9bc9ba4501e14c84e /include/asm-h8300/pci.h | |
| parent | 0274aa2506fd2fe89a58dd6cd64d3b3f7b976af8 (diff) | |
| parent | 86b3786078d63242d3194ffc58ae8dae1d1bbef3 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'include/asm-h8300/pci.h')
| -rw-r--r-- | include/asm-h8300/pci.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-h8300/pci.h b/include/asm-h8300/pci.h index d032729b19df..5edad5b70fd5 100644 --- a/include/asm-h8300/pci.h +++ b/include/asm-h8300/pci.h | |||
| @@ -15,7 +15,7 @@ extern inline void pcibios_set_master(struct pci_dev *dev) | |||
| 15 | /* No special bus mastering setup handling */ | 15 | /* No special bus mastering setup handling */ |
| 16 | } | 16 | } |
| 17 | 17 | ||
| 18 | extern inline void pcibios_penalize_isa_irq(int irq) | 18 | extern inline void pcibios_penalize_isa_irq(int irq, int active) |
| 19 | { | 19 | { |
| 20 | /* We don't do dynamic PCI IRQ allocation */ | 20 | /* We don't do dynamic PCI IRQ allocation */ |
| 21 | } | 21 | } |