diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 08:25:15 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 08:25:27 -0500 |
| commit | 7b9dd47136c07ffd883aff6926c7b281e4c1eea4 (patch) | |
| tree | b835312e76fe323de3e1cbbb0d15fca5a3f7ef9c /arch/arm/mach-netx/generic.c | |
| parent | 2e0e943436912ffe0848ece58167edfe754edb96 (diff) | |
| parent | 0575fb754dbfc32a01f297e778533340a533ec68 (diff) | |
Merge branch 'restart' into for-linus
Conflicts:
arch/arm/mach-exynos/cpu.c
The changes to arch/arm/mach-exynos/cpu.c were moved to
mach-exynos/common.c.
Diffstat (limited to 'arch/arm/mach-netx/generic.c')
| -rw-r--r-- | arch/arm/mach-netx/generic.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-netx/generic.c b/arch/arm/mach-netx/generic.c index 00023b5cf12b..59e67979f197 100644 --- a/arch/arm/mach-netx/generic.c +++ b/arch/arm/mach-netx/generic.c | |||
| @@ -187,3 +187,8 @@ static int __init netx_init(void) | |||
| 187 | 187 | ||
| 188 | subsys_initcall(netx_init); | 188 | subsys_initcall(netx_init); |
| 189 | 189 | ||
| 190 | void netx_restart(char mode, const char *cmd) | ||
| 191 | { | ||
| 192 | writel(NETX_SYSTEM_RES_CR_FIRMW_RES_EN | NETX_SYSTEM_RES_CR_FIRMW_RES, | ||
| 193 | NETX_SYSTEM_RES_CR); | ||
| 194 | } | ||