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-prima2/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-prima2/include')
| -rw-r--r-- | arch/arm/mach-prima2/include/mach/system.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/arm/mach-prima2/include/mach/system.h b/arch/arm/mach-prima2/include/mach/system.h index 0dbd257ad16d..2c7d2a9d0c92 100644 --- a/arch/arm/mach-prima2/include/mach/system.h +++ b/arch/arm/mach-prima2/include/mach/system.h | |||
| @@ -9,21 +9,9 @@ | |||
| 9 | #ifndef __MACH_SYSTEM_H__ | 9 | #ifndef __MACH_SYSTEM_H__ |
| 10 | #define __MACH_SYSTEM_H__ | 10 | #define __MACH_SYSTEM_H__ |
| 11 | 11 | ||
| 12 | #include <linux/bitops.h> | ||
| 13 | #include <mach/hardware.h> | ||
| 14 | |||
| 15 | #define SIRFSOC_SYS_RST_BIT BIT(31) | ||
| 16 | |||
| 17 | extern void __iomem *sirfsoc_rstc_base; | ||
| 18 | |||
| 19 | static inline void arch_idle(void) | 12 | static inline void arch_idle(void) |
| 20 | { | 13 | { |
| 21 | cpu_do_idle(); | 14 | cpu_do_idle(); |
| 22 | } | 15 | } |
| 23 | 16 | ||
| 24 | static inline void arch_reset(char mode, const char *cmd) | ||
| 25 | { | ||
| 26 | writel(SIRFSOC_SYS_RST_BIT, sirfsoc_rstc_base); | ||
| 27 | } | ||
| 28 | |||
| 29 | #endif | 17 | #endif |