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/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-netx/include/mach')
| -rw-r--r-- | arch/arm/mach-netx/include/mach/system.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm/mach-netx/include/mach/system.h b/arch/arm/mach-netx/include/mach/system.h index dc7b4bc003c5..b38fa36d58c4 100644 --- a/arch/arm/mach-netx/include/mach/system.h +++ b/arch/arm/mach-netx/include/mach/system.h | |||
| @@ -19,20 +19,10 @@ | |||
| 19 | #ifndef __ASM_ARCH_SYSTEM_H | 19 | #ifndef __ASM_ARCH_SYSTEM_H |
| 20 | #define __ASM_ARCH_SYSTEM_H | 20 | #define __ASM_ARCH_SYSTEM_H |
| 21 | 21 | ||
| 22 | #include <linux/io.h> | ||
| 23 | #include <mach/hardware.h> | ||
| 24 | #include "netx-regs.h" | ||
| 25 | |||
| 26 | static inline void arch_idle(void) | 22 | static inline void arch_idle(void) |
| 27 | { | 23 | { |
| 28 | cpu_do_idle(); | 24 | cpu_do_idle(); |
| 29 | } | 25 | } |
| 30 | 26 | ||
| 31 | static inline void arch_reset(char mode, const char *cmd) | ||
| 32 | { | ||
| 33 | writel(NETX_SYSTEM_RES_CR_FIRMW_RES_EN | NETX_SYSTEM_RES_CR_FIRMW_RES, | ||
| 34 | NETX_SYSTEM_RES_CR); | ||
| 35 | } | ||
| 36 | |||
| 37 | #endif | 27 | #endif |
| 38 | 28 | ||