diff options
Diffstat (limited to 'arch/arm/mach-ixp4xx')
| -rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/system.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/vmalloc.h | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/arch/arm/mach-ixp4xx/include/mach/system.h b/arch/arm/mach-ixp4xx/include/mach/system.h index 54c0af7fa2d4..24337d9d275b 100644 --- a/arch/arm/mach-ixp4xx/include/mach/system.h +++ b/arch/arm/mach-ixp4xx/include/mach/system.h | |||
| @@ -26,7 +26,7 @@ static inline void arch_reset(char mode, const char *cmd) | |||
| 26 | { | 26 | { |
| 27 | if ( 1 && mode == 's') { | 27 | if ( 1 && mode == 's') { |
| 28 | /* Jump into ROM at address 0 */ | 28 | /* Jump into ROM at address 0 */ |
| 29 | cpu_reset(0); | 29 | soft_restart(0); |
| 30 | } else { | 30 | } else { |
| 31 | /* Use on-chip reset capability */ | 31 | /* Use on-chip reset capability */ |
| 32 | 32 | ||
diff --git a/arch/arm/mach-ixp4xx/include/mach/vmalloc.h b/arch/arm/mach-ixp4xx/include/mach/vmalloc.h deleted file mode 100644 index 9bcd64d59854..000000000000 --- a/arch/arm/mach-ixp4xx/include/mach/vmalloc.h +++ /dev/null | |||
| @@ -1,5 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-ixp4xx/include/mach/vmalloc.h | ||
| 3 | */ | ||
| 4 | #define VMALLOC_END (0xff000000UL) | ||
| 5 | |||
