diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-02 08:39:09 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-02 08:39:09 -0400 |
| commit | d2f6409584e2c62ffad81690562330ff3bf4a458 (patch) | |
| tree | 3bdfb97d0b51be2f7f414f2107e97603c1206abb /include/sound/timer.h | |
| parent | e1b09eba2686eca94a3a188042b518df6044a3c1 (diff) | |
| parent | 4a89a04f1ee21a7c1f4413f1ad7dcfac50ff9b63 (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/sound/timer.h')
| -rw-r--r-- | include/sound/timer.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/sound/timer.h b/include/sound/timer.h index 57fde990606e..1898511a0f38 100644 --- a/include/sound/timer.h +++ b/include/sound/timer.h | |||
| @@ -152,6 +152,4 @@ extern int snd_timer_pause(snd_timer_instance_t * timeri); | |||
| 152 | 152 | ||
| 153 | extern void snd_timer_interrupt(snd_timer_t * timer, unsigned long ticks_left); | 153 | extern void snd_timer_interrupt(snd_timer_t * timer, unsigned long ticks_left); |
| 154 | 154 | ||
| 155 | extern unsigned int snd_timer_system_resolution(void); | ||
| 156 | |||
| 157 | #endif /* __SOUND_TIMER_H */ | 155 | #endif /* __SOUND_TIMER_H */ |