diff options
author | Eric Miao <eric.miao@marvell.com> | 2008-09-11 04:27:30 +0200 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-09-25 10:54:55 +0200 |
commit | 0ffcbfd54ea81ca24c0749f55ca4fcf3e2bdc23e (patch) | |
tree | 46890e5788964978c5ab0ea915decf8dbd772929 /arch/arm/mach-pxa/pxa25x.c | |
parent | [ARM] pxa: merge common cpu_is_pxa255() code together (diff) | |
download | linux-0ffcbfd54ea81ca24c0749f55ca4fcf3e2bdc23e.tar.xz linux-0ffcbfd54ea81ca24c0749f55ca4fcf3e2bdc23e.zip |
[ARM] pxa: make cpu_is_pxa2* macros more consistent
1. add a CPUID table in the comment
2. make cpu_is_pxa25x() true for PXA210/250/255/26x
3. PXA210 is treated as PXA25x, all related code modified to
reflect this
Signed-off-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-pxa/pxa25x.c')
-rw-r--r-- | arch/arm/mach-pxa/pxa25x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c index 1be490d6936d..a3a6aff5f0d4 100644 --- a/arch/arm/mach-pxa/pxa25x.c +++ b/arch/arm/mach-pxa/pxa25x.c @@ -348,7 +348,7 @@ static int __init pxa25x_init(void) { int i, ret = 0; - if (cpu_is_pxa21x() || cpu_is_pxa25x()) { + if (cpu_is_pxa25x()) { reset_status = RCSR; |