diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-11-19 17:04:25 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-19 17:04:25 +0900 |
commit | fe040be2fdc49a4132c5f64359c629aeeb8e4947 (patch) | |
tree | 40323a8f05d3754372f561bb8f4698ef1a4e9c8f /arch/arm/mach-orion5x/mpp.c | |
parent | 2006920a18cc9f499e5cccf9e6f1aa9f6120705e (diff) | |
parent | 6722a4016d7f5f107a82ad71a3ee1ccec105532f (diff) | |
download | talos-obmc-linux-fe040be2fdc49a4132c5f64359c629aeeb8e4947.tar.gz talos-obmc-linux-fe040be2fdc49a4132c5f64359c629aeeb8e4947.zip |
Merge branch 'common/fbdev-mipi' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
Diffstat (limited to 'arch/arm/mach-orion5x/mpp.c')
-rw-r--r-- | arch/arm/mach-orion5x/mpp.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-orion5x/mpp.c b/arch/arm/mach-orion5x/mpp.c index bc4c3b9aaf83..db485d3b8144 100644 --- a/arch/arm/mach-orion5x/mpp.c +++ b/arch/arm/mach-orion5x/mpp.c @@ -127,7 +127,7 @@ void __init orion5x_mpp_conf(struct orion5x_mpp_mode *mode) /* Initialize gpiolib. */ orion_gpio_init(); - while (mode->mpp >= 0) { + for ( ; mode->mpp >= 0; mode++) { u32 *reg; int num_type; int shift; @@ -160,8 +160,6 @@ void __init orion5x_mpp_conf(struct orion5x_mpp_mode *mode) orion_gpio_set_unused(mode->mpp); orion_gpio_set_valid(mode->mpp, !!(mode->type == MPP_GPIO)); - - mode++; } writel(mpp_0_7_ctrl, MPP_0_7_CTRL); |