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-mips/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-mips/pci.h')
| -rw-r--r-- | include/asm-mips/pci.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-mips/pci.h b/include/asm-mips/pci.h index 2d323b6e147d..d70dc355c1f3 100644 --- a/include/asm-mips/pci.h +++ b/include/asm-mips/pci.h | |||
| @@ -69,7 +69,7 @@ extern unsigned long PCIBIOS_MIN_MEM; | |||
| 69 | 69 | ||
| 70 | extern void pcibios_set_master(struct pci_dev *dev); | 70 | extern void pcibios_set_master(struct pci_dev *dev); |
| 71 | 71 | ||
| 72 | static inline void pcibios_penalize_isa_irq(int irq) | 72 | static inline void pcibios_penalize_isa_irq(int irq, int active) |
| 73 | { | 73 | { |
| 74 | /* We don't do dynamic PCI IRQ allocation */ | 74 | /* We don't do dynamic PCI IRQ allocation */ |
| 75 | } | 75 | } |