From 92f4c10476feecf176a861d1b85da6f23bde492a Mon Sep 17 00:00:00 2001 From: Haojian Zhuang Date: Wed, 4 Nov 2009 21:58:16 -0500 Subject: [PATCH] --- yaml --- r: 172591 b: refs/heads/master c: 61333c63005e5708977e309da32c952057ee445b h: refs/heads/master i: 172589: fa91f0c6cdbbcc460bb9c0544ed9415644a1ff9e 172587: aabcf5b30c296ca3b24bf16a0d3f5d311c7a5052 172583: a39ccf6bdcb7f79ed513c4898fde9943a95aaf19 172575: 65fef8757418b2783cb33e87ff6d5a3cb13b2aa5 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-pxa/include/mach/hardware.h | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1bbee8d54bfb..b496e06e1861 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bf293aec15fb223fd81c0cdfd1829edff95a325b +refs/heads/master: 61333c63005e5708977e309da32c952057ee445b diff --git a/trunk/arch/arm/mach-pxa/include/mach/hardware.h b/trunk/arch/arm/mach-pxa/include/mach/hardware.h index aa3d9f70a08a..50f1297bf5ac 100644 --- a/trunk/arch/arm/mach-pxa/include/mach/hardware.h +++ b/trunk/arch/arm/mach-pxa/include/mach/hardware.h @@ -105,6 +105,7 @@ * * PXA935 A0 0x56056931 0x1E653013 * PXA935 B0 0x56056936 0x6E653013 + * PXA935 B1 0x56056938 0x8E653013 */ #ifdef CONFIG_PXA25x #define __cpu_is_pxa210(id) \ @@ -283,7 +284,7 @@ _id == 0x3; \ }) -#define __cpu_is_pxa9xx(id) \ +#define __cpu_is_pxa93x(id) \ ({ \ unsigned int _id = (id) >> 4 & 0xfff; \ _id == 0x683 || _id == 0x693; \ @@ -299,9 +300,9 @@ __cpu_is_pxa3xx(read_cpuid_id()); \ }) -#define cpu_is_pxa9xx() \ +#define cpu_is_pxa93x() \ ({ \ - __cpu_is_pxa9xx(read_cpuid_id()); \ + __cpu_is_pxa93x(read_cpuid_id()); \ }) /* * return current memory and LCD clock frequency in units of 10kHz