summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ixp4xx
diff options
context:
space:
mode:
authorKrzysztof Hałasa2014-01-02 09:34:10 +0100
committerJiri Kosina2014-01-02 13:47:25 +0100
commit97e81acd31de184af22b78c4977a66f40ca1efa3 (patch)
treed2fcbad25ee6b51cc9036e287d6fd991558627cb /arch/arm/mach-ixp4xx
parentDocumentation: update /proc/uptime field description (diff)
downloadkernel-qcow2-linux-97e81acd31de184af22b78c4977a66f40ca1efa3.tar.gz
kernel-qcow2-linux-97e81acd31de184af22b78c4977a66f40ca1efa3.tar.xz
kernel-qcow2-linux-97e81acd31de184af22b78c4977a66f40ca1efa3.zip
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>
Diffstat (limited to 'arch/arm/mach-ixp4xx')
-rw-r--r--arch/arm/mach-ixp4xx/common.c2
1 files changed, 1 insertions, 1 deletions
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 {