summaryrefslogtreecommitdiff
path: root/include/sound/timer.h
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2005-06-23 01:26:47 (GMT)
committerSteve French <sfrench@us.ibm.com>2005-06-23 01:26:47 (GMT)
commitea0daab4ae4a2f853f06c76961c0ed324fd0804c (patch)
treef6fbe2db5772695181b7a7257b05e43343bd8d75 /include/sound/timer.h
parent58aab753de605c14b9878a897e7349c3063afeff (diff)
parent1bdf7a78c2b21fb94dfe7994dbe89310b18479d2 (diff)
downloadlinux-ea0daab4ae4a2f853f06c76961c0ed324fd0804c.tar.xz
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git
Diffstat (limited to 'include/sound/timer.h')
-rw-r--r--include/sound/timer.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/sound/timer.h b/include/sound/timer.h
index 57fde99..1898511 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);
extern void snd_timer_interrupt(snd_timer_t * timer, unsigned long ticks_left);
-extern unsigned int snd_timer_system_resolution(void);
-
#endif /* __SOUND_TIMER_H */