diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-06-10 17:11:06 +0200 |
|---|---|---|
| committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-06-24 15:40:40 +0200 |
| commit | 9a763bfbe45d8d4afe953993907188322a49a4ec (patch) | |
| tree | aad5479d993406fa97ba23306e17007c9277bd52 /arch/arm/mach-mxc91231 | |
| parent | 3aad49e138a9690969df52672c454e1d6d01b501 (diff) | |
| download | blackbird-op-linux-9a763bfbe45d8d4afe953993907188322a49a4ec.tar.gz blackbird-op-linux-9a763bfbe45d8d4afe953993907188322a49a4ec.zip | |
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-mxc91231')
| -rw-r--r-- | arch/arm/mach-mxc91231/devices.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mxc91231/mm.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-mxc91231/devices.c b/arch/arm/mach-mxc91231/devices.c index 353bd977b393..027af4f0d18a 100644 --- a/arch/arm/mach-mxc91231/devices.c +++ b/arch/arm/mach-mxc91231/devices.c @@ -135,7 +135,7 @@ static struct mxc_gpio_port mxc_gpio_ports[] = { }, }; -int __init mxc_register_gpios(void) +int __init mxc91231_register_gpios(void) { return mxc_gpio_init(mxc_gpio_ports, ARRAY_SIZE(mxc_gpio_ports)); } diff --git a/arch/arm/mach-mxc91231/mm.c b/arch/arm/mach-mxc91231/mm.c index 6becda3ff331..1f23c743ae65 100644 --- a/arch/arm/mach-mxc91231/mm.c +++ b/arch/arm/mach-mxc91231/mm.c @@ -88,7 +88,10 @@ void __init mxc91231_map_io(void) iotable_init(mxc_io_desc, ARRAY_SIZE(mxc_io_desc)); } +int mxc91231_register_gpios(void); + void __init mxc91231_init_irq(void) { + mxc91231_register_gpios(); mxc_init_irq(MXC91231_IO_ADDRESS(MXC91231_AVIC_BASE_ADDR)); } |
