diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-20 09:02:39 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-20 09:02:39 +0100 |
| commit | fbc2a06056c9aa3cb8c44bf1cfeb1d260e229e5c (patch) | |
| tree | feb2a1c13ad3dff5a8c7ab3c0265e8eca7a0c5a3 /arch/sh/kernel/timers | |
| parent | a3d732f93785da17e0137210deadb4616f5536fc (diff) | |
| parent | ee2f6cc7f9ea2542ad46070ed62ba7aa04d08871 (diff) | |
| download | linux-stable-fbc2a06056c9aa3cb8c44bf1cfeb1d260e229e5c.tar.gz | |
Merge branch 'linus' into x86/uv
Diffstat (limited to 'arch/sh/kernel/timers')
| -rw-r--r-- | arch/sh/kernel/timers/timer-tmu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/timers/timer-tmu.c b/arch/sh/kernel/timers/timer-tmu.c index aaaf90d06b85..3c61ddd4d43e 100644 --- a/arch/sh/kernel/timers/timer-tmu.c +++ b/arch/sh/kernel/timers/timer-tmu.c @@ -120,7 +120,7 @@ static void tmu_set_mode(enum clock_event_mode mode, { switch (mode) { case CLOCK_EVT_MODE_PERIODIC: - ctrl_outl(ctrl_inl(TMU0_TCNT), TMU0_TCOR); + ctrl_outl(tmu_latest_interval[TMU0], TMU0_TCOR); break; case CLOCK_EVT_MODE_ONESHOT: ctrl_outl(0, TMU0_TCOR); |