From: Krzysztof Hałasa <khalasa@piap.pl>
Date: Thu, 2 Jan 2014 08:34:10 +0000 (+0100)
Subject: IXP4xx: remove '1 &&' from a condition check in ixp4xx_restart()
X-Git-Tag: v3.14-rc1~128^2~9
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=97e81acd31de184af22b78c4977a66f40ca1efa3;p=linux.git

IXP4xx: remove '1 &&' from a condition check in ixp4xx_restart()

Signed-off-by: Krzysztof Hałasa <khalasa@piap.pl>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
---

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 {