diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
| commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
| tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /include/sound/mixer_oss.h | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'include/sound/mixer_oss.h')
| -rw-r--r-- | include/sound/mixer_oss.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/mixer_oss.h b/include/sound/mixer_oss.h index ca5b4822b62c..197b9e3d612b 100644 --- a/include/sound/mixer_oss.h +++ b/include/sound/mixer_oss.h | |||
| @@ -61,7 +61,7 @@ struct snd_mixer_oss { | |||
| 61 | unsigned int active_index); | 61 | unsigned int active_index); |
| 62 | void *private_data_recsrc; | 62 | void *private_data_recsrc; |
| 63 | void (*private_free_recsrc)(struct snd_mixer_oss *mixer); | 63 | void (*private_free_recsrc)(struct snd_mixer_oss *mixer); |
| 64 | struct semaphore reg_mutex; | 64 | struct mutex reg_mutex; |
| 65 | struct snd_info_entry *proc_entry; | 65 | struct snd_info_entry *proc_entry; |
| 66 | int oss_dev_alloc; | 66 | int oss_dev_alloc; |
| 67 | /* --- */ | 67 | /* --- */ |