diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-21 11:02:24 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-21 11:02:30 -0400 |
| commit | 28f9f19db9dda54c851d5689539d86f6fc008773 (patch) | |
| tree | 469f5d7b24871b6fe001b7ad9acac859405f4822 /arch/arm/include | |
| parent | 40262b2b6efac507005a2c981175266bf81152a7 (diff) | |
| parent | 52a7a1cec88acdaf3f8b36a6b1fe904f6eca7ee5 (diff) | |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/cputype.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/include/asm/cputype.h b/arch/arm/include/asm/cputype.h index 54a1f1d76b14..20ae96cc0020 100644 --- a/arch/arm/include/asm/cputype.h +++ b/arch/arm/include/asm/cputype.h | |||
| @@ -78,7 +78,10 @@ static inline unsigned int __attribute_const__ read_cpuid_tcmstatus(void) | |||
| 78 | #else | 78 | #else |
| 79 | static inline int cpu_is_xsc3(void) | 79 | static inline int cpu_is_xsc3(void) |
| 80 | { | 80 | { |
| 81 | if ((read_cpuid_id() & 0xffffe000) == 0x69056000) | 81 | unsigned int id; |
| 82 | id = read_cpuid_id() & 0xffffe000; | ||
| 83 | /* It covers both Intel ID and Marvell ID */ | ||
| 84 | if ((id == 0x69056000) || (id == 0x56056000)) | ||
| 82 | return 1; | 85 | return 1; |
| 83 | 86 | ||
| 84 | return 0; | 87 | return 0; |