diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-07-13 18:09:23 -0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-07-13 18:09:23 -0400 |
| commit | c514720716c7b109ff980f8b3cb93f9af872c91c (patch) | |
| tree | 490a9578995705de69712893a190b67651bddc56 /include/asm-sh/pci.h | |
| parent | 07929dcb963786512c760dd3ecd148d89295e7e5 (diff) | |
| parent | 1e279dd855d15b72364b4103f872d67d8592647e (diff) | |
Automatic merge with /usr/src/ntfs-2.6.git.
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 | } |