summaryrefslogtreecommitdiffstats
path: root/include/sound/timer.h
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-11-08 01:14:20 +0100
committerPaul Mackerras <paulus@samba.org>2005-11-08 01:14:20 +0100
commit24bfb00123e82a2e70bd115277d922438813515b (patch)
tree27328b8a5718e16d64e2d101f4b7ddcad5930aed /include/sound/timer.h
parentMerge ../linux-2.6 (diff)
parentMerge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff)
downloadlinux-24bfb00123e82a2e70bd115277d922438813515b.tar.xz
linux-24bfb00123e82a2e70bd115277d922438813515b.zip
Merge ../linux-2.6
Diffstat (limited to 'include/sound/timer.h')
-rw-r--r--include/sound/timer.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/sound/timer.h b/include/sound/timer.h
index 1898511a0f38..b55f38ae56e1 100644
--- a/include/sound/timer.h
+++ b/include/sound/timer.h
@@ -88,6 +88,7 @@ struct _snd_timer_hardware {
struct _snd_timer {
snd_timer_class_t tmr_class;
snd_card_t *card;
+ struct module *module;
int tmr_device;
int tmr_subdevice;
char id[64];