From: Nils Faerber <nils.faerber@kernelconcepts.de>
Date: Wed, 12 Jan 2011 10:31:33 +0000 (+0100)
Subject: Merge branch 'csb1725' into csb1725-bdt
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0c5b6ccb23db192a50ae0709fee957336d1ac719;hp=e32a5cebd8e50a7b4967cbd57e9de8c6b7668f51;p=mv-sheeva.git

Merge branch 'csb1725' into csb1725-bdt
---

diff --git a/arch/arm/mach-mv78xx0/mpp.c b/arch/arm/mach-mv78xx0/mpp.c
index 09c7869b1a0..2b517224772 100644
--- a/arch/arm/mach-mv78xx0/mpp.c
+++ b/arch/arm/mach-mv78xx0/mpp.c
@@ -61,7 +61,7 @@ void __init mv78xx0_mpp_conf(unsigned int *mpp_list)
 	}
 	printk("\n");
 
-	for ( ; *mpp_list; mpp_list++) {
+	while (*mpp_list) {
 		unsigned int num = MPP_NUM(*mpp_list);
 		unsigned int sel = MPP_SEL(*mpp_list);
 		int shift, gpio_mode;