Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 172591
b: refs/heads/master
c: 61333c6
h: refs/heads/master
i:
  172589: fa91f0c
  172587: aabcf5b
  172583: a39ccf6
  172575: 65fef87
v: v3
  • Loading branch information
Haojian Zhuang authored and Eric Miao committed Dec 1, 2009
1 parent 91a4c80 commit 92f4c10
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: bf293aec15fb223fd81c0cdfd1829edff95a325b
refs/heads/master: 61333c63005e5708977e309da32c952057ee445b
7 changes: 4 additions & 3 deletions trunk/arch/arm/mach-pxa/include/mach/hardware.h
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@
*
* PXA935 A0 0x56056931 0x1E653013
* PXA935 B0 0x56056936 0x6E653013
* PXA935 B1 0x56056938 0x8E653013
*/
#ifdef CONFIG_PXA25x
#define __cpu_is_pxa210(id) \
Expand Down Expand Up @@ -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; \
Expand All @@ -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
Expand Down

0 comments on commit 92f4c10

Please sign in to comment.