From 97e81acd31de184af22b78c4977a66f40ca1efa3 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Krzysztof=20Ha=C5=82asa?= <khalasa@piap.pl>
Date: Thu, 2 Jan 2014 09:34:10 +0100
Subject: [PATCH] IXP4xx: remove '1 &&' from a condition check in
 ixp4xx_restart()
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Krzysztof Hałasa <khalasa@piap.pl>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
---
 arch/arm/mach-ixp4xx/common.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c
index 9edaf4734fa8..a7906ebedb19 100644
--- a/arch/arm/mach-ixp4xx/common.c
+++ b/arch/arm/mach-ixp4xx/common.c
@@ -560,7 +560,7 @@ static void __init ixp4xx_clockevent_init(void)
 
 void ixp4xx_restart(enum reboot_mode mode, const char *cmd)
 {
-	if ( 1 && mode == REBOOT_SOFT) {
+	if (mode == REBOOT_SOFT) {
 		/* Jump into ROM at address 0 */
 		soft_restart(0);
 	} else {
-- 
2.20.1