summaryrefslogtreecommitdiff
path: root/arch/arm/mach-iop33x/include/mach/system.h
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2011-12-17 02:50:01 +0400
committerOlof Johansson <olof@lixom.net>2011-12-17 02:50:01 +0400
commitb94ee062b5b41c7fc0e44309e8546d4694e75007 (patch)
tree2ba08003be8d25a573c17a00a627b424de4bb2e4 /arch/arm/mach-iop33x/include/mach/system.h
parentdc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50 (diff)
parent3bdc3484e8f2b1b219ad0397d81ce4601fbaf76d (diff)
downloadlinux-b94ee062b5b41c7fc0e44309e8546d4694e75007.tar.xz
Merge branch 'depends/rmk/devel-stable' into next/boards
Diffstat (limited to 'arch/arm/mach-iop33x/include/mach/system.h')
-rw-r--r--arch/arm/mach-iop33x/include/mach/system.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-iop33x/include/mach/system.h b/arch/arm/mach-iop33x/include/mach/system.h
index f192a34be073..86d1b20dd692 100644
--- a/arch/arm/mach-iop33x/include/mach/system.h
+++ b/arch/arm/mach-iop33x/include/mach/system.h
@@ -19,5 +19,5 @@ static inline void arch_reset(char mode, const char *cmd)
*IOP3XX_PCSR = 0x30;
/* Jump into ROM at address 0 */
- cpu_reset(0);
+ soft_restart(0);
}