From 0d7116b479580e66df5e93bc3e91e19311f8819f Mon Sep 17 00:00:00 2001
From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Mon, 21 Nov 2005 17:01:13 +0000
Subject: [PATCH] --- yaml --- r: 14591 b: refs/heads/master c:
 2f3eca8b4f1e9ff3c712519170f5c070ddbddff9 h: refs/heads/master i:   14589:
 01ca94473f973da8834942b71418aa98e9d38fe7   14587:
 44e1c463b00fce58e9308c3a8506a8c1be455c70   14583:
 632c27dc6c4c4ce0ff21b9975952aa6c2a30d099   14575:
 bcfab63e3d851f221f926f530e038898b4d38321   14559:
 392504baa28b00b1d654488590d97e30f66c6625   14527:
 a85bd3afa2385e3cae1c3ae444fa53fbfdceadc3   14463:
 9f1ef23a0fa3fc140be321d5561e4c1c43ee6d04   14335:
 17c11290a85606a80545b40505262233069d4eee v: v3

---
 [refs]                               | 2 +-
 trunk/arch/arm/mach-sa1100/assabet.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 41740ae05708..417bf2039cf3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 30a09616df38ab282e66084f40fb438fe715b2ec
+refs/heads/master: 2f3eca8b4f1e9ff3c712519170f5c070ddbddff9
diff --git a/trunk/arch/arm/mach-sa1100/assabet.c b/trunk/arch/arm/mach-sa1100/assabet.c
index 75efb5da5b6d..a66ac61233a2 100644
--- a/trunk/arch/arm/mach-sa1100/assabet.c
+++ b/trunk/arch/arm/mach-sa1100/assabet.c
@@ -293,7 +293,8 @@ static void __init get_assabet_scr(void)
 	GPDR |= 0x3fc;			/* Configure GPIO 9:2 as outputs */
 	GPSR = 0x3fc;			/* Write 0xFF to GPIO 9:2 */
 	GPDR &= ~(0x3fc);		/* Configure GPIO 9:2 as inputs */
-	for(i = 100; i--; scr = GPLR);	/* Read GPIO 9:2 */
+	for(i = 100; i--; )		/* Read GPIO 9:2 */
+		scr = GPLR;
 	GPDR |= 0x3fc;			/*  restore correct pin direction */
 	scr &= 0x3fc;			/* save as system configuration byte. */
 	SCR_value = scr;