diff options
| author | Greg KH <gregkh@suse.de> | 2005-09-12 15:10:59 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-12 15:10:59 -0400 |
| commit | ad2c10f8f00d3fe2e37dd8a107e7cf4ac0459489 (patch) | |
| tree | 5571f6a5784f51efddf9c1ee0408894cd63a460f /sound/oss/sys_timer.c | |
| parent | 6b7839007098a6b5612d31690e11277d4242e6ae (diff) | |
| parent | 2ade81473636b33aaac64495f89a7dc572c529f0 (diff) | |
Merge ../torvalds-2.6/
Diffstat (limited to 'sound/oss/sys_timer.c')
| -rw-r--r-- | sound/oss/sys_timer.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/oss/sys_timer.c b/sound/oss/sys_timer.c index 6afe29b763b7..c9d04518b172 100644 --- a/sound/oss/sys_timer.c +++ b/sound/oss/sys_timer.c | |||
| @@ -28,8 +28,7 @@ static unsigned long prev_event_time; | |||
| 28 | 28 | ||
| 29 | static void poll_def_tmr(unsigned long dummy); | 29 | static void poll_def_tmr(unsigned long dummy); |
| 30 | static DEFINE_SPINLOCK(lock); | 30 | static DEFINE_SPINLOCK(lock); |
| 31 | 31 | static DEFINE_TIMER(def_tmr, poll_def_tmr, 0, 0); | |
| 32 | static struct timer_list def_tmr = TIMER_INITIALIZER(poll_def_tmr, 0, 0); | ||
| 33 | 32 | ||
| 34 | static unsigned long | 33 | static unsigned long |
| 35 | tmr2ticks(int tmr_value) | 34 | tmr2ticks(int tmr_value) |