diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2012-01-03 14:03:30 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 13:57:18 +0100 |
| commit | ff84ded26525adb4c0dcef3a4d590b0d08967293 (patch) | |
| tree | 658f1cd803067b7a13a536ddb864580c4dd8140a /arch/arm/mach-s3c64xx/include/mach | |
| parent | ARM: 7265/1: restart: S3C24XX: use new restart hook (diff) | |
| download | linux-ff84ded26525adb4c0dcef3a4d590b0d08967293.tar.xz linux-ff84ded26525adb4c0dcef3a4d590b0d08967293.zip | |
ARM: 7266/1: restart: S3C64XX: use new restart hook
Hook these platforms restart code into the new restart hook rather
than using arch_reset().
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-s3c64xx/include/mach')
| -rw-r--r-- | arch/arm/mach-s3c64xx/include/mach/system.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/mach-s3c64xx/include/mach/system.h b/arch/arm/mach-s3c64xx/include/mach/system.h index d8ca5786ba25..51bc8eb046de 100644 --- a/arch/arm/mach-s3c64xx/include/mach/system.h +++ b/arch/arm/mach-s3c64xx/include/mach/system.h @@ -11,8 +11,6 @@ #ifndef __ASM_ARCH_SYSTEM_H #define __ASM_ARCH_SYSTEM_H __FILE__ -#include <plat/watchdog-reset.h> - static void arch_idle(void) { /* nothing here yet */ @@ -20,11 +18,6 @@ static void arch_idle(void) static void arch_reset(char mode, const char *cmd) { - if (mode != 's') - arch_wdt_reset(); - - /* if all else fails, or mode was for soft, jump to 0 */ - soft_restart(0); } #endif /* __ASM_ARCH_IRQ_H */ |