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-vexpress/include | |
| 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-vexpress/include')
| -rw-r--r-- | arch/arm/mach-vexpress/include/mach/system.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-vexpress/include/mach/system.h b/arch/arm/mach-vexpress/include/mach/system.h index 899a4e628a4c..f653a8e265bd 100644 --- a/arch/arm/mach-vexpress/include/mach/system.h +++ b/arch/arm/mach-vexpress/include/mach/system.h | |||
| @@ -30,8 +30,4 @@ static inline void arch_idle(void) | |||
| 30 | cpu_do_idle(); | 30 | cpu_do_idle(); |
| 31 | } | 31 | } |
| 32 | 32 | ||
| 33 | static inline void arch_reset(char mode, const char *cmd) | ||
| 34 | { | ||
| 35 | } | ||
| 36 | |||
| 37 | #endif | 33 | #endif |