aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx1/generic.c
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-06-10 11:11:06 -0400
committerUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-06-24 09:40:40 -0400
commit9a763bfbe45d8d4afe953993907188322a49a4ec (patch)
treeaad5479d993406fa97ba23306e17007c9277bd52 /arch/arm/mach-mx1/generic.c
parent3aad49e138a9690969df52672c454e1d6d01b501 (diff)
ARM: imx: get rid of mxc_gpio_init
This function is defined once for each imx family and so is in the way when compiling a kernel for more than one SoC. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx1/generic.c')
-rw-r--r--arch/arm/mach-mx1/generic.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-mx1/generic.c b/arch/arm/mach-mx1/generic.c
index 5a745d99e660..a9be5f14bd9d 100644
--- a/arch/arm/mach-mx1/generic.c
+++ b/arch/arm/mach-mx1/generic.c
@@ -46,7 +46,10 @@ void __init mx1_map_io(void)
46 iotable_init(imx_io_desc, ARRAY_SIZE(imx_io_desc)); 46 iotable_init(imx_io_desc, ARRAY_SIZE(imx_io_desc));
47} 47}
48 48
49int imx1_register_gpios(void);
50
49void __init mx1_init_irq(void) 51void __init mx1_init_irq(void)
50{ 52{
53 imx1_register_gpios();
51 mxc_init_irq(MX1_IO_ADDRESS(MX1_AVIC_BASE_ADDR)); 54 mxc_init_irq(MX1_IO_ADDRESS(MX1_AVIC_BASE_ADDR));
52} 55}