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-arm/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-arm/pci.h')
-rw-r--r-- | include/asm-arm/pci.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/pci.h b/include/asm-arm/pci.h index e300646fe650..b28f1c95dd62 100644 --- a/include/asm-arm/pci.h +++ b/include/asm-arm/pci.h | |||
@@ -14,7 +14,7 @@ static inline void pcibios_set_master(struct pci_dev *dev) | |||
14 | /* No special bus mastering setup handling */ | 14 | /* No special bus mastering setup handling */ |
15 | } | 15 | } |
16 | 16 | ||
17 | static inline void pcibios_penalize_isa_irq(int irq) | 17 | static inline void pcibios_penalize_isa_irq(int irq, int active) |
18 | { | 18 | { |
19 | /* We don't do dynamic PCI IRQ allocation */ | 19 | /* We don't do dynamic PCI IRQ allocation */ |
20 | } | 20 | } |