diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-06-22 21:26:47 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-06-22 21:26:47 -0400 |
| commit | ea0daab4ae4a2f853f06c76961c0ed324fd0804c (patch) | |
| tree | f6fbe2db5772695181b7a7257b05e43343bd8d75 /sound/core/seq/seq_timer.h | |
| parent | 58aab753de605c14b9878a897e7349c3063afeff (diff) | |
| parent | 1bdf7a78c2b21fb94dfe7994dbe89310b18479d2 (diff) | |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git
Diffstat (limited to 'sound/core/seq/seq_timer.h')
| -rw-r--r-- | sound/core/seq/seq_timer.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/core/seq/seq_timer.h b/sound/core/seq/seq_timer.h index 4c0872df8931..287ed68591de 100644 --- a/sound/core/seq/seq_timer.h +++ b/sound/core/seq/seq_timer.h | |||
| @@ -64,8 +64,6 @@ extern seq_timer_t *snd_seq_timer_new(void); | |||
| 64 | /* delete timer (destructor) */ | 64 | /* delete timer (destructor) */ |
| 65 | extern void snd_seq_timer_delete(seq_timer_t **tmr); | 65 | extern void snd_seq_timer_delete(seq_timer_t **tmr); |
| 66 | 66 | ||
| 67 | void snd_seq_timer_set_tick_resolution(seq_timer_tick_t *tick, int tempo, int ppq, int nticks); | ||
| 68 | |||
| 69 | /* */ | 67 | /* */ |
| 70 | static inline void snd_seq_timer_update_tick(seq_timer_tick_t *tick, unsigned long resolution) | 68 | static inline void snd_seq_timer_update_tick(seq_timer_tick_t *tick, unsigned long resolution) |
| 71 | { | 69 | { |