diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-29 15:48:37 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-29 15:48:37 +0100 |
commit | d50f58bbd979e86378dfdec982452041f0e604ef (patch) | |
tree | 511938033b3346983175c70dd4d0afeb00b59b82 /arch/arm/mach-mxc91231/devices.c | |
parent | 129961ecaf21c9ee899ad9067d917c1aa172fb7a (diff) | |
parent | 79d3c2c2395a89a70d25f0c77c11afc87efab89b (diff) | |
download | kernel_samsung_smdk4412-d50f58bbd979e86378dfdec982452041f0e604ef.zip kernel_samsung_smdk4412-d50f58bbd979e86378dfdec982452041f0e604ef.tar.gz kernel_samsung_smdk4412-d50f58bbd979e86378dfdec982452041f0e604ef.tar.bz2 |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Diffstat (limited to 'arch/arm/mach-mxc91231/devices.c')
-rw-r--r-- | arch/arm/mach-mxc91231/devices.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mxc91231/devices.c b/arch/arm/mach-mxc91231/devices.c index 353bd97..027af4f 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)); } |