diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-15 01:33:11 -0500 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-15 01:33:11 -0500 |
| commit | 1bb95834bbcdc969e477a9284cf96c17a4c2616f (patch) | |
| tree | 9cf66b22a611bb6bc78778c05dac72263bb45a23 /arch/arm/mach-msm/timer.c | |
| parent | 85345517fe6d4de27b0d6ca19fef9d28ac947c4a (diff) | |
| parent | a41c73e04673b47730df682446f0d52f95e32a5b (diff) | |
Merge remote branch 'airlied/drm-fixes' into drm-intel-fixes
Diffstat (limited to 'arch/arm/mach-msm/timer.c')
| -rw-r--r-- | arch/arm/mach-msm/timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-msm/timer.c b/arch/arm/mach-msm/timer.c index 7689848ec680..950100f19d07 100644 --- a/arch/arm/mach-msm/timer.c +++ b/arch/arm/mach-msm/timer.c | |||
| @@ -137,7 +137,7 @@ static struct msm_clock msm_clocks[] = { | |||
| 137 | .rating = 200, | 137 | .rating = 200, |
| 138 | .read = msm_gpt_read, | 138 | .read = msm_gpt_read, |
| 139 | .mask = CLOCKSOURCE_MASK(32), | 139 | .mask = CLOCKSOURCE_MASK(32), |
| 140 | .shift = 24, | 140 | .shift = 17, |
| 141 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, | 141 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, |
| 142 | }, | 142 | }, |
| 143 | .irq = { | 143 | .irq = { |