git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'sh/pm-runtime' and 'common/clkfwk' into sh-fixes-for-linus
[pandora-kernel.git]
/
sound
/
core
/
seq
/
seq_timer.h
diff --git
a/sound/core/seq/seq_timer.h
b/sound/core/seq/seq_timer.h
index
e9ee154
..
88dfb71
100644
(file)
--- a/
sound/core/seq/seq_timer.h
+++ b/
sound/core/seq/seq_timer.h
@@
-138,4
+138,11
@@
int snd_seq_timer_set_skew(struct snd_seq_timer *tmr, unsigned int skew, unsigne
snd_seq_real_time_t snd_seq_timer_get_cur_time(struct snd_seq_timer *tmr);
snd_seq_tick_time_t snd_seq_timer_get_cur_tick(struct snd_seq_timer *tmr);
snd_seq_real_time_t snd_seq_timer_get_cur_time(struct snd_seq_timer *tmr);
snd_seq_tick_time_t snd_seq_timer_get_cur_tick(struct snd_seq_timer *tmr);
+extern int seq_default_timer_class;
+extern int seq_default_timer_sclass;
+extern int seq_default_timer_card;
+extern int seq_default_timer_device;
+extern int seq_default_timer_subdevice;
+extern int seq_default_timer_resolution;
+
#endif
#endif