diff options
| author | Olof Johansson <olof@lixom.net> | 2011-12-19 21:12:24 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2011-12-19 21:13:41 -0800 |
| commit | 844e8a16f25568eefd02a6bfb40bdd9bc04704b8 (patch) | |
| tree | fdfe4de420c66517a2e4a2a25a454997c6210e95 /arch/arm/mach-w90x900/include/mach/system.h | |
| parent | 5ecdd39f6cdd57aa42e072bf30aa7239fd109d7a (diff) | |
| parent | a53bfa07369b7c3448a60d29f0fc2e81751ed0b7 (diff) | |
Merge branch 'picoxcell/cleanup' into next/cleanup
* picoxcell/cleanup: (4 commits)
MAINTAINERS: add maintainer entry for Picochip picoxcell
ARM: picoxcell: move io mappings to common.c
ARM: picoxcell: don't reserve irq_descs
ARM: picoxcell: remove mach/memory.h
Conflicts:
arch/arm/mach-at91/setup.c
Diffstat (limited to 'arch/arm/mach-w90x900/include/mach/system.h')
| -rw-r--r-- | arch/arm/mach-w90x900/include/mach/system.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-w90x900/include/mach/system.h b/arch/arm/mach-w90x900/include/mach/system.h index ce228bdc66dd..68875a1c16be 100644 --- a/arch/arm/mach-w90x900/include/mach/system.h +++ b/arch/arm/mach-w90x900/include/mach/system.h @@ -33,7 +33,7 @@ static void arch_reset(char mode, const char *cmd) { if (mode == 's') { /* Jump into ROM at address 0 */ - cpu_reset(0); + soft_restart(0); } else { __raw_writel(WTE | WTRE | WTCLK, WTCR); } |