diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-07-14 00:09:23 +0200 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-07-14 00:09:23 +0200 |
| commit | c514720716c7b109ff980f8b3cb93f9af872c91c (patch) | |
| tree | 490a9578995705de69712893a190b67651bddc56 /include/asm-sparc/pci.h | |
| parent | Automatic merge with /usr/src/ntfs-2.6.git. (diff) | |
| parent | [PATCH] v850: Align ___start___param to match parameter alignment (diff) | |
| download | linux-c514720716c7b109ff980f8b3cb93f9af872c91c.tar.xz linux-c514720716c7b109ff980f8b3cb93f9af872c91c.zip | |
Automatic merge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'include/asm-sparc/pci.h')
| -rw-r--r-- | include/asm-sparc/pci.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-sparc/pci.h b/include/asm-sparc/pci.h index 44bb38758c96..97052baf90c1 100644 --- a/include/asm-sparc/pci.h +++ b/include/asm-sparc/pci.h @@ -20,7 +20,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 */ } |