diff options
Diffstat (limited to 'arch/arm/mach-s3c2410')
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/system-reset.h | 4 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/vmalloc.h | 20 |
2 files changed, 2 insertions, 22 deletions
diff --git a/arch/arm/mach-s3c2410/include/mach/system-reset.h b/arch/arm/mach-s3c2410/include/mach/system-reset.h index 6faadcee7729..913893d44650 100644 --- a/arch/arm/mach-s3c2410/include/mach/system-reset.h +++ b/arch/arm/mach-s3c2410/include/mach/system-reset.h | |||
@@ -19,7 +19,7 @@ static void | |||
19 | arch_reset(char mode, const char *cmd) | 19 | arch_reset(char mode, const char *cmd) |
20 | { | 20 | { |
21 | if (mode == 's') { | 21 | if (mode == 's') { |
22 | cpu_reset(0); | 22 | soft_restart(0); |
23 | } | 23 | } |
24 | 24 | ||
25 | if (s3c24xx_reset_hook) | 25 | if (s3c24xx_reset_hook) |
@@ -28,5 +28,5 @@ arch_reset(char mode, const char *cmd) | |||
28 | arch_wdt_reset(); | 28 | arch_wdt_reset(); |
29 | 29 | ||
30 | /* we'll take a jump through zero as a poor second */ | 30 | /* we'll take a jump through zero as a poor second */ |
31 | cpu_reset(0); | 31 | soft_restart(0); |
32 | } | 32 | } |
diff --git a/arch/arm/mach-s3c2410/include/mach/vmalloc.h b/arch/arm/mach-s3c2410/include/mach/vmalloc.h deleted file mode 100644 index 7a311e8dddba..000000000000 --- a/arch/arm/mach-s3c2410/include/mach/vmalloc.h +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | /* arch/arm/mach-s3c2410/include/mach/vmalloc.h | ||
2 | * | ||
3 | * from arch/arm/mach-iop3xx/include/mach/vmalloc.h | ||
4 | * | ||
5 | * Copyright (c) 2003 Simtec Electronics <linux@simtec.co.uk> | ||
6 | * http://www.simtec.co.uk/products/SWLINUX/ | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify | ||
9 | * it under the terms of the GNU General Public License version 2 as | ||
10 | * published by the Free Software Foundation. | ||
11 | * | ||
12 | * S3C2410 vmalloc definition | ||
13 | */ | ||
14 | |||
15 | #ifndef __ASM_ARCH_VMALLOC_H | ||
16 | #define __ASM_ARCH_VMALLOC_H | ||
17 | |||
18 | #define VMALLOC_END 0xF6000000UL | ||
19 | |||
20 | #endif /* __ASM_ARCH_VMALLOC_H */ | ||