projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of ../mine
[cascardo/linux.git]
/
arch
/
arm
/
mach-msm
/
timer.c
diff --git
a/arch/arm/mach-msm/timer.c
b/arch/arm/mach-msm/timer.c
index
7689848
..
950100f
100644
(file)
--- a/
arch/arm/mach-msm/timer.c
+++ b/
arch/arm/mach-msm/timer.c
@@
-137,7
+137,7
@@
static struct msm_clock msm_clocks[] = {
.rating = 200,
.read = msm_gpt_read,
.mask = CLOCKSOURCE_MASK(32),
- .shift =
24
,
+ .shift =
17
,
.flags = CLOCK_SOURCE_IS_CONTINUOUS,
},
.irq = {