diff options
| author | Russell King | 2009-09-21 17:02:24 +0200 |
|---|---|---|
| committer | Russell King | 2009-09-21 17:02:30 +0200 |
| commit | 28f9f19db9dda54c851d5689539d86f6fc008773 (patch) | |
| tree | 469f5d7b24871b6fe001b7ad9acac859405f4822 /arch/arm/include/asm/cputype.h | |
| parent | ARM: 5621/1: at91/dmaengine: integration of at_hdmac driver in at91sam9g45 se... (diff) | |
| parent | [ARM] pxafb: add accelerator ID for PXA3xx GCU (diff) | |
| download | kernel-qcow2-linux-28f9f19db9dda54c851d5689539d86f6fc008773.tar.gz kernel-qcow2-linux-28f9f19db9dda54c851d5689539d86f6fc008773.tar.xz kernel-qcow2-linux-28f9f19db9dda54c851d5689539d86f6fc008773.zip | |
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/asm/cputype.h')
| -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) #else static inline int cpu_is_xsc3(void) { - if ((read_cpuid_id() & 0xffffe000) == 0x69056000) + unsigned int id; + id = read_cpuid_id() & 0xffffe000; + /* It covers both Intel ID and Marvell ID */ + if ((id == 0x69056000) || (id == 0x56056000)) return 1; return 0; |