diff options
| author |   Paul Mackerras <paulus@samba.org> | 2007-11-02 14:03:14 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-11-02 14:03:14 +1100 |
| commit | 97a4649d6ffce4a5d7f5ce018d87a6cefcb4ad03 (patch) | |
| tree | 8f7f591754baa934a842357e75e773a525bfb147 /arch/mips/pci/fixup-pmcmsp.c | |
| parent | [POWERPC] powerpc: Fix demotion of segments to 4K pages (diff) | |
| parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| download | linux-dev-97a4649d6ffce4a5d7f5ce018d87a6cefcb4ad03.tar.xz linux-dev-97a4649d6ffce4a5d7f5ce018d87a6cefcb4ad03.zip | |
Merge branch 'linux-2.6' into merge
Diffstat (limited to 'arch/mips/pci/fixup-pmcmsp.c')
| -rw-r--r-- | arch/mips/pci/fixup-pmcmsp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/pci/fixup-pmcmsp.c b/arch/mips/pci/fixup-pmcmsp.c index 00261211dbfa..65735b1b7665 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"); |