diff options
Diffstat (limited to 'arch/arm/mach-ks8695/include')
-rw-r--r-- | arch/arm/mach-ks8695/include/mach/system.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-ks8695/include/mach/vmalloc.h | 19 |
2 files changed, 1 insertions, 20 deletions
diff --git a/arch/arm/mach-ks8695/include/mach/system.h b/arch/arm/mach-ks8695/include/mach/system.h index fb1dda9be2d..ceb19c90aa5 100644 --- a/arch/arm/mach-ks8695/include/mach/system.h +++ b/arch/arm/mach-ks8695/include/mach/system.h | |||
@@ -32,7 +32,7 @@ static void arch_reset(char mode, const char *cmd) | |||
32 | unsigned int reg; | 32 | unsigned int reg; |
33 | 33 | ||
34 | if (mode == 's') | 34 | if (mode == 's') |
35 | cpu_reset(0); | 35 | soft_restart(0); |
36 | 36 | ||
37 | /* disable timer0 */ | 37 | /* disable timer0 */ |
38 | reg = __raw_readl(KS8695_TMR_VA + KS8695_TMCON); | 38 | reg = __raw_readl(KS8695_TMR_VA + KS8695_TMCON); |
diff --git a/arch/arm/mach-ks8695/include/mach/vmalloc.h b/arch/arm/mach-ks8695/include/mach/vmalloc.h deleted file mode 100644 index 744ac66be3a..00000000000 --- a/arch/arm/mach-ks8695/include/mach/vmalloc.h +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | /* | ||
2 | * arch/arm/mach-ks8695/include/mach/vmalloc.h | ||
3 | * | ||
4 | * Copyright (C) 2006 Ben Dooks | ||
5 | * Copyright (C) 2006 Simtec Electronics <linux@simtec.co.uk> | ||
6 | * | ||
7 | * KS8695 vmalloc definition | ||
8 | * | ||
9 | * This program is free software; you can redistribute it and/or modify | ||
10 | * it under the terms of the GNU General Public License version 2 as | ||
11 | * published by the Free Software Foundation. | ||
12 | */ | ||
13 | |||
14 | #ifndef __ASM_ARCH_VMALLOC_H | ||
15 | #define __ASM_ARCH_VMALLOC_H | ||
16 | |||
17 | #define VMALLOC_END (KS8695_IO_VA & PGDIR_MASK) | ||
18 | |||
19 | #endif | ||