]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
arm: fix compile failure in orion5x/dns323-setup.c
authorPaul Gortmaker <paul.gortmaker@windriver.com>
Mon, 1 Aug 2011 16:34:48 +0000 (12:34 -0400)
committerPaul Gortmaker <paul.gortmaker@windriver.com>
Fri, 19 Aug 2011 20:05:32 +0000 (16:05 -0400)
Upstream commit d5341942d784134f2997b3ff82cd63cf71d1f932 "PCI: Make the
struct pci_dev * argument of pci_fixup_irqs const." leaked an extra
"const" into an actual call site (vs a proto/decl) which causes this:

arch/arm/mach-orion5x/dns323-setup.c: In function 'dns323_pci_map_irq':
arch/arm/mach-orion5x/dns323-setup.c:80: error: expected expression before 'const'
arch/arm/mach-orion5x/dns323-setup.c:80: error: too few arguments to function 'orion5x_pci_map_irq'
make[3]: *** [arch/arm/mach-orion5x/dns323-setup.o] Error 1

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Acked-by: Nicolas Pitre <nico@fluxnic.net>
Acked-by: Ralf Baechle <ralf@linux-mips.org>
arch/arm/mach-orion5x/dns323-setup.c

index a6eddae82a0b5b236db29658bbeb2c8b8a1d30ff..c105556a0ee1a9ab158742e8d3b417eae7a8646b 100644 (file)
@@ -77,7 +77,7 @@ static int __init dns323_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
        /*
         * Check for devices with hard-wired IRQs.
         */
-       irq = orion5x_pci_map_irq(const dev, slot, pin);
+       irq = orion5x_pci_map_irq(dev, slot, pin);
        if (irq != -1)
                return irq;