diff options
author | Thomas Gleixner <tglx@tglx.tec.linutronix.de> | 2005-07-13 10:45:00 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@mtd.linutronix.de> | 2005-07-13 10:45:00 +0200 |
commit | 1b3035b7fcc72b6b36f2a3634dad832eb2453ce8 (patch) | |
tree | 728174d72943cc9b981a5843553551df62eddc41 /include/asm-mips/pci.h | |
parent | a98a5d04f400ad112e59cadd739dbabf89417e60 (diff) | |
parent | c32511e2718618f0b53479eb36e07439aa363a74 (diff) | |
download | blackbird-op-linux-1b3035b7fcc72b6b36f2a3634dad832eb2453ce8.tar.gz blackbird-op-linux-1b3035b7fcc72b6b36f2a3634dad832eb2453ce8.zip |
Merge with rsync://fileserver/linux
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; extern void pcibios_set_master(struct pci_dev *dev); -static inline void pcibios_penalize_isa_irq(int irq) +static inline void pcibios_penalize_isa_irq(int irq, int active) { /* We don't do dynamic PCI IRQ allocation */ } |