diff options
| author |   James Morris <jmorris@namei.org> | 2010-11-29 08:27:07 +1100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-11-29 08:27:07 +1100 |
| commit | 1d6d75684d869406e5bb2ac5d3ed9454f52d0cab (patch) | |
| tree | afb229254bed6415407b7b7d4641f9f792109966 /arch/arm/mach-mmp/include/mach/cputype.h | |
| parent | kernel: add roundup() code comment from akpm (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 (diff) | |
| download | linux-dev-1d6d75684d869406e5bb2ac5d3ed9454f52d0cab.tar.xz linux-dev-1d6d75684d869406e5bb2ac5d3ed9454f52d0cab.zip | |
Merge branch 'master' into next
Diffstat (limited to 'arch/arm/mach-mmp/include/mach/cputype.h')
| -rw-r--r-- | arch/arm/mach-mmp/include/mach/cputype.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-mmp/include/mach/cputype.h b/arch/arm/mach-mmp/include/mach/cputype.h index f43a68b213f1..8a3b56dfd35d 100644 --- a/arch/arm/mach-mmp/include/mach/cputype.h +++ b/arch/arm/mach-mmp/include/mach/cputype.h @@ -46,7 +46,8 @@ static inline int cpu_is_pxa910(void) #ifdef CONFIG_CPU_MMP2 static inline int cpu_is_mmp2(void) { - return (((cpu_readid_id() >> 8) & 0xff) == 0x58); + return (((read_cpuid_id() >> 8) & 0xff) == 0x58); +} #else #define cpu_is_mmp2() (0) #endif |