diff options
| author |   Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-12 16:04:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-12 16:04:50 -0700 |
| commit | 3f603ed319d5120e883e64ac5967b2fc848fc43b (patch) | |
| tree | 52ef311c245e4e4cd623b546ea1daf05a5ea8911 /include/asm-ppc | |
| parent | [PATCH] v4l: broken hybrid dvb inclusion (diff) | |
| parent | [ACPI] merge acpi-2.6.12 branch into latest Linux 2.6.13-rc... (diff) | |
| download | linux-dev-3f603ed319d5120e883e64ac5967b2fc848fc43b.tar.xz linux-dev-3f603ed319d5120e883e64ac5967b2fc848fc43b.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/linux-2.6
Diffstat (limited to 'include/asm-ppc')
| -rw-r--r-- | include/asm-ppc/pci.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-ppc/pci.h b/include/asm-ppc/pci.h index db0a2a0ec74d..a13d55870e62 100644 --- a/include/asm-ppc/pci.h +++ b/include/asm-ppc/pci.h @@ -37,7 +37,7 @@ extern inline void pcibios_set_master(struct pci_dev *dev) /* No special bus mastering setup handling */ } -extern inline void pcibios_penalize_isa_irq(int irq) +extern inline void pcibios_penalize_isa_irq(int irq, int active) { /* We don't do dynamic PCI IRQ allocation */ } |