diff options
| author |   Russell King <rmk+kernel@arm.linux.org.uk> | 2010-09-25 10:27:50 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-09-25 10:27:50 +0100 |
| commit | f933b87e6f06fcce5988fd5e8ebf3a97858a7155 (patch) | |
| tree | eb334347814e930bd0fd39b2f8291655280a597c /arch/arm/mach-mmp/include/mach/system.h | |
| parent | ARM: 6401/1: plug a race in the alignment trap handler (diff) | |
| parent | ARM: pxa: remove pr_<level> uses of KERN_<level> (diff) | |
| download | linux-dev-f933b87e6f06fcce5988fd5e8ebf3a97858a7155.tar.xz linux-dev-f933b87e6f06fcce5988fd5e8ebf3a97858a7155.zip | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Diffstat (limited to 'arch/arm/mach-mmp/include/mach/system.h')
| -rw-r--r-- | arch/arm/mach-mmp/include/mach/system.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/mach-mmp/include/mach/system.h b/arch/arm/mach-mmp/include/mach/system.h index 4f5b0e0ce6cf..1a8a25edb1b4 100644 --- a/arch/arm/mach-mmp/include/mach/system.h +++ b/arch/arm/mach-mmp/include/mach/system.h @@ -9,6 +9,8 @@ #ifndef __ASM_MACH_SYSTEM_H #define __ASM_MACH_SYSTEM_H +#include <mach/cputype.h> + static inline void arch_idle(void) { cpu_do_idle(); @@ -16,6 +18,9 @@ static inline void arch_idle(void) static inline void arch_reset(char mode, const char *cmd) { - cpu_reset(0); + if (cpu_is_pxa168()) + cpu_reset(0xffff0000); + else + cpu_reset(0); } #endif /* __ASM_MACH_SYSTEM_H */ |