diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2007-02-10 01:26:32 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2007-02-10 01:26:32 -0500 |
| commit | b22364c8eec89e6b0c081a237f3b6348df87796f (patch) | |
| tree | 233a923281fb640106465d076997ff511efb6edf /include/sound/pcm_oss.h | |
| parent | 2c8dc071517ec2843869024dc82be2e246f41064 (diff) | |
| parent | 66efc5a7e3061c3597ac43a8bb1026488d57e66b (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/sound/pcm_oss.h')
| -rw-r--r-- | include/sound/pcm_oss.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/sound/pcm_oss.h b/include/sound/pcm_oss.h index c854647b6f3c..1cd4f64cdf31 100644 --- a/include/sound/pcm_oss.h +++ b/include/sound/pcm_oss.h | |||
| @@ -56,6 +56,7 @@ struct snd_pcm_oss_runtime { | |||
| 56 | size_t mmap_bytes; | 56 | size_t mmap_bytes; |
| 57 | char *buffer; /* vmallocated period */ | 57 | char *buffer; /* vmallocated period */ |
| 58 | size_t buffer_used; /* used length from period buffer */ | 58 | size_t buffer_used; /* used length from period buffer */ |
| 59 | struct mutex params_lock; | ||
| 59 | #ifdef CONFIG_SND_PCM_OSS_PLUGINS | 60 | #ifdef CONFIG_SND_PCM_OSS_PLUGINS |
| 60 | struct snd_pcm_plugin *plugin_first; | 61 | struct snd_pcm_plugin *plugin_first; |
| 61 | struct snd_pcm_plugin *plugin_last; | 62 | struct snd_pcm_plugin *plugin_last; |