diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-07-14 03:11:44 +0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-07-14 03:11:44 +0400 |
commit | 08cd84c81f27d5bd22ba958b7cae6d566c509280 (patch) | |
tree | 6fdb546c151410851fd3c604d42590afa4215084 /include/asm-mips/pci.h | |
parent | e9dd2561793c05d70c9df1bc16a2dde6f23388df (diff) | |
parent | 327309e899662b482c58cf25f574513d38b5788c (diff) | |
download | linux-08cd84c81f27d5bd22ba958b7cae6d566c509280.tar.xz |
Merge /spare/repo/netdev-2.6 branch 'ieee80211'
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 */ } |