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-sa1100/include/mach | |
| 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-sa1100/include/mach')
| -rw-r--r-- | arch/arm/mach-sa1100/include/mach/system.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/arch/arm/mach-sa1100/include/mach/system.h b/arch/arm/mach-sa1100/include/mach/system.h index 345d35b7450c..e17b208f76d4 100644 --- a/arch/arm/mach-sa1100/include/mach/system.h +++ b/arch/arm/mach-sa1100/include/mach/system.h | |||
| @@ -3,20 +3,7 @@ | |||
| 3 | * | 3 | * |
| 4 | * Copyright (c) 1999 Nicolas Pitre <nico@fluxnic.net> | 4 | * Copyright (c) 1999 Nicolas Pitre <nico@fluxnic.net> |
| 5 | */ | 5 | */ |
| 6 | #include <mach/hardware.h> | ||
| 7 | |||
| 8 | static inline void arch_idle(void) | 6 | static inline void arch_idle(void) |
| 9 | { | 7 | { |
| 10 | cpu_do_idle(); | 8 | cpu_do_idle(); |
| 11 | } | 9 | } |
| 12 | |||
| 13 | static inline void arch_reset(char mode, const char *cmd) | ||
| 14 | { | ||
| 15 | if (mode == 's') { | ||
| 16 | /* Jump into ROM at address 0 */ | ||
| 17 | soft_restart(0); | ||
| 18 | } else { | ||
| 19 | /* Use on-chip reset capability */ | ||
| 20 | RSRR = RSRR_SWR; | ||
| 21 | } | ||
| 22 | } | ||