From: Arnd Bergmann Date: Mon, 30 Apr 2012 14:58:45 +0000 (+0000) Subject: ARM: iop13xx: fix iq81340sc_atux_map_irq prototype X-Git-Tag: v3.7-rc1~38^2~5^2~7 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=58cbdbe0248d0bf3eed47a9ac69d330a140726a9;p=linux-2.6-block.git ARM: iop13xx: fix iq81340sc_atux_map_irq prototype The pci map_irq callbacks get a 'const' pci_dev argument, so change the iop13xx version to use the same prototype as everything else. Without this patch, building iop13xx_defconfig results in: arch/arm/mach-iop13xx/iq81340sc.c:63:2: warning: initialization from incompatible pointer type [enabled by default] arch/arm/mach-iop13xx/iq81340sc.c:63:2: warning: (near initialization for 'iq81340sc_pci.map_irq') [enabled by default] Signed-off-by: Arnd Bergmann Cc: Lennert Buytenhek Cc: Dan Williams --- diff --git a/arch/arm/mach-iop13xx/iq81340sc.c b/arch/arm/mach-iop13xx/iq81340sc.c index 060cddde2fd4..e94744111634 100644 --- a/arch/arm/mach-iop13xx/iq81340sc.c +++ b/arch/arm/mach-iop13xx/iq81340sc.c @@ -30,7 +30,7 @@ extern int init_atu; static int __init -iq81340sc_atux_map_irq(struct pci_dev *dev, u8 idsel, u8 pin) +iq81340sc_atux_map_irq(const struct pci_dev *dev, u8 idsel, u8 pin) { WARN_ON(idsel < 1 || idsel > 2);