diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-06 08:42:55 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-06 08:42:55 +0000 |
commit | 71d8c5b11e3b5936ae6c2e0b1dd6f5c78b305b65 (patch) | |
tree | c815434adc34cb7274ef6a0ee16cf8491fa0c03e /arch/arm/mach-orion5x/mpp.c | |
parent | 0fff6b9a4e0aba233a2ff644316d29b0cb784e33 (diff) | |
parent | 53936c56dcaf1db818fe953ae05592a8b5e345b5 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into devel-stable
Diffstat (limited to 'arch/arm/mach-orion5x/mpp.c')
-rw-r--r-- | arch/arm/mach-orion5x/mpp.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-orion5x/mpp.c b/arch/arm/mach-orion5x/mpp.c index db485d3b814..2288207726e 100644 --- a/arch/arm/mach-orion5x/mpp.c +++ b/arch/arm/mach-orion5x/mpp.c @@ -124,9 +124,6 @@ void __init orion5x_mpp_conf(struct orion5x_mpp_mode *mode) u32 mpp_8_15_ctrl = readl(MPP_8_15_CTRL); u32 mpp_16_19_ctrl = readl(MPP_16_19_CTRL); - /* Initialize gpiolib. */ - orion_gpio_init(); - for ( ; mode->mpp >= 0; mode++) { u32 *reg; int num_type; |