diff options
author | David Woodhouse <dwmw2@infradead.org> | 2007-07-11 17:55:48 +0400 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2007-07-11 17:55:48 +0400 |
commit | db1b39d8b860e3716620c225bc86e0ec41764e34 (patch) | |
tree | 8739074db733ef767400ea92cfbfed9352ddb92d /arch/mips/pci/fixup-tx4938.c | |
parent | a6bc432e296dfa1f05d4b586ca5ca3085a2d42d7 (diff) | |
parent | 4eb6bf6bfb580afaf1e1a1d30cba17a078530cf4 (diff) | |
download | linux-db1b39d8b860e3716620c225bc86e0ec41764e34.tar.xz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/mips/pci/fixup-tx4938.c')
-rw-r--r-- | arch/mips/pci/fixup-tx4938.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/pci/fixup-tx4938.c b/arch/mips/pci/fixup-tx4938.c index f455520ada88..2485f47dfe6f 100644 --- a/arch/mips/pci/fixup-tx4938.c +++ b/arch/mips/pci/fixup-tx4938.c @@ -69,7 +69,7 @@ int pci_get_irq(struct pci_dev *dev, int pin) return irq; } -int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin) +int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) { unsigned char irq = 0; |