diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
| commit | 24bfb00123e82a2e70bd115277d922438813515b (patch) | |
| tree | 27328b8a5718e16d64e2d101f4b7ddcad5930aed /include/sound/timer.h | |
| parent | c6135234550ed89a6fd0e8cb229633967e41d649 (diff) | |
| parent | 3f00d3e8fb963968a922d821a9a53b503b687e81 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'include/sound/timer.h')
| -rw-r--r-- | include/sound/timer.h | 1 |
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 { | |||
| 88 | struct _snd_timer { | 88 | struct _snd_timer { |
| 89 | snd_timer_class_t tmr_class; | 89 | snd_timer_class_t tmr_class; |
| 90 | snd_card_t *card; | 90 | snd_card_t *card; |
| 91 | struct module *module; | ||
| 91 | int tmr_device; | 92 | int tmr_device; |
| 92 | int tmr_subdevice; | 93 | int tmr_subdevice; |
| 93 | char id[64]; | 94 | char id[64]; |