aboutsummaryrefslogtreecommitdiff
path: root/arch/mips/pci/fixup-pmcmsp.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2007-11-02 14:03:14 +1100
committerPaul Mackerras <paulus@samba.org>2007-11-02 14:03:14 +1100
commit97a4649d6ffce4a5d7f5ce018d87a6cefcb4ad03 (patch)
tree8f7f591754baa934a842357e75e773a525bfb147 /arch/mips/pci/fixup-pmcmsp.c
parentf6ab0b922c3423b88c0e6e3e2c5fc1e58d83055d (diff)
parent54866f032307063776b4eff7eadb131d47f9f9b4 (diff)
Merge branch 'linux-2.6' into merge
Diffstat (limited to 'arch/mips/pci/fixup-pmcmsp.c')
-rw-r--r--arch/mips/pci/fixup-pmcmsp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/pci/fixup-pmcmsp.c b/arch/mips/pci/fixup-pmcmsp.c
index 00261211dbf..65735b1b766 100644
--- a/arch/mips/pci/fixup-pmcmsp.c
+++ b/arch/mips/pci/fixup-pmcmsp.c
@@ -202,7 +202,7 @@ int pcibios_plat_dev_init(struct pci_dev *dev)
* RETURNS: IRQ number
*
****************************************************************************/
-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)
{
#if !defined(CONFIG_PMC_MSP7120_GW) && !defined(CONFIG_PMC_MSP7120_EVAL)
printk(KERN_WARNING "PCI: unknown board, no PCI IRQs assigned.\n");