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-sh/pci.h | |
| parent | 55ee3b8365fd5d301b9076eea739146f2b91e82c (diff) | |
| parent | 5028770a42e7bc4d15791a44c28f0ad539323807 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/linux-2.6
Diffstat (limited to 'include/asm-sh/pci.h')
| -rw-r--r-- | include/asm-sh/pci.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-sh/pci.h b/include/asm-sh/pci.h index 26044889c770..0a523c85b11c 100644 --- a/include/asm-sh/pci.h +++ b/include/asm-sh/pci.h | |||
| @@ -36,7 +36,7 @@ struct pci_dev; | |||
| 36 | 36 | ||
| 37 | extern void pcibios_set_master(struct pci_dev *dev); | 37 | extern void pcibios_set_master(struct pci_dev *dev); |
| 38 | 38 | ||
| 39 | static inline void pcibios_penalize_isa_irq(int irq) | 39 | static inline void pcibios_penalize_isa_irq(int irq, int active) |
| 40 | { | 40 | { |
| 41 | /* We don't do dynamic PCI IRQ allocation */ | 41 | /* We don't do dynamic PCI IRQ allocation */ |
| 42 | } | 42 | } |