diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-22 12:33:51 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-22 12:33:51 -0400 |
| commit | ef7994fa2aecd8d1fb0d75034caa050ff908d26a (patch) | |
| tree | aa7bbe9499256ced149dce70891de5eedf33c283 /include/sound/core.h | |
| parent | ad8686bc05adc2b8301d749f5958bd904f3a46ee (diff) | |
| parent | a497c3ba1d97fc69c1e78e7b96435ba8c2cb42ee (diff) | |
Merge 3.16-rc2 into staging-next
We want the staging fixes here as well.
Diffstat (limited to 'include/sound/core.h')
| -rw-r--r-- | include/sound/core.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/sound/core.h b/include/sound/core.h index eedda2cdfe57..1df3f2fe5350 100644 --- a/include/sound/core.h +++ b/include/sound/core.h | |||
| @@ -116,6 +116,8 @@ struct snd_card { | |||
| 116 | int user_ctl_count; /* count of all user controls */ | 116 | int user_ctl_count; /* count of all user controls */ |
| 117 | struct list_head controls; /* all controls for this card */ | 117 | struct list_head controls; /* all controls for this card */ |
| 118 | struct list_head ctl_files; /* active control files */ | 118 | struct list_head ctl_files; /* active control files */ |
| 119 | struct mutex user_ctl_lock; /* protects user controls against | ||
| 120 | concurrent access */ | ||
| 119 | 121 | ||
| 120 | struct snd_info_entry *proc_root; /* root for soundcard specific files */ | 122 | struct snd_info_entry *proc_root; /* root for soundcard specific files */ |
| 121 | struct snd_info_entry *proc_id; /* the card id */ | 123 | struct snd_info_entry *proc_id; /* the card id */ |