projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 's3c-move' into devel
[linux-2.6-block.git]
/
arch
/
arm
/
mach-pxa
/
time.c
diff --git
a/arch/arm/mach-pxa/time.c
b/arch/arm/mach-pxa/time.c
index b0d6b32654cf622d13a9ac91073a2f1426381d97..f8a9a62959e5bfe9cb426e75560efb17a08f7194 100644
(file)
--- a/
arch/arm/mach-pxa/time.c
+++ b/
arch/arm/mach-pxa/time.c
@@
-155,7
+155,7
@@
static void __init pxa_timer_init(void)
OIER = 0;
OSSR = OSSR_M0 | OSSR_M1 | OSSR_M2 | OSSR_M3;
- if (cpu_is_pxa2
1x() || cpu_is_pxa2
5x())
+ if (cpu_is_pxa25x())
clock_tick_rate = 3686400;
else if (machine_is_mainstone())
clock_tick_rate = 3249600;