summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-04-30 16:58:45 +0200
committerArnd Bergmann <arnd@arndb.de>2012-10-07 10:33:08 +0200
commit58cbdbe0248d0bf3eed47a9ac69d330a140726a9 (patch)
tree78675f361b85b248103ac1ad00e12865f87227c4
parentARM: iop13xx: mark iop13xx_scan_bus as __devinit (diff)
downloadlinux-58cbdbe0248d0bf3eed47a9ac69d330a140726a9.tar.xz
linux-58cbdbe0248d0bf3eed47a9ac69d330a140726a9.zip
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 <arnd@arndb.de> Cc: Lennert Buytenhek <kernel@wantstofly.org> Cc: Dan Williams <djbw@fb.com>
-rw-r--r--arch/arm/mach-iop13xx/iq81340sc.c2
1 files changed, 1 insertions, 1 deletions
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);