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-s3c2410/include/mach/system.h | |
| 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-s3c2410/include/mach/system.h')
| -rw-r--r-- | arch/arm/mach-s3c2410/include/mach/system.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-s3c2410/include/mach/system.h b/arch/arm/mach-s3c2410/include/mach/system.h index a8cbca6701e5..5e215c1a5c8f 100644 --- a/arch/arm/mach-s3c2410/include/mach/system.h +++ b/arch/arm/mach-s3c2410/include/mach/system.h | |||
| @@ -15,12 +15,10 @@ | |||
| 15 | 15 | ||
| 16 | #include <mach/map.h> | 16 | #include <mach/map.h> |
| 17 | #include <mach/idle.h> | 17 | #include <mach/idle.h> |
| 18 | #include <mach/reset.h> | ||
| 19 | 18 | ||
| 20 | #include <mach/regs-clock.h> | 19 | #include <mach/regs-clock.h> |
| 21 | 20 | ||
| 22 | void (*s3c24xx_idle)(void); | 21 | void (*s3c24xx_idle)(void); |
| 23 | void (*s3c24xx_reset_hook)(void); | ||
| 24 | 22 | ||
| 25 | void s3c24xx_default_idle(void) | 23 | void s3c24xx_default_idle(void) |
| 26 | { | 24 | { |
| @@ -54,5 +52,3 @@ static void arch_idle(void) | |||
| 54 | else | 52 | else |
| 55 | s3c24xx_default_idle(); | 53 | s3c24xx_default_idle(); |
| 56 | } | 54 | } |
| 57 | |||
| 58 | #include <mach/system-reset.h> | ||