Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6

[linux-2.6-omap-h63xx.git] / include / sound / timer.h

diff --git a/include/sound/timer.h b/include/sound/timer.h
index 1898511a0f389d53a61023d68d7ad2c2f0b8df9c..b55f38ae56e13ed3428f189a09a39a8ff4566cf0 100644 (file)
--- 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];