diff options
| author | James Morris <james.l.morris@oracle.com> | 2012-05-03 22:46:40 -0400 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2012-05-03 22:46:40 -0400 |
| commit | 898bfc1d46bd76f8ea2a0fbd239dd2073efe2aa3 (patch) | |
| tree | e6e666085abe674dbf6292555961fe0a0f2e2d2f /sound/core | |
| parent | 08162e6a23d476544adfe1164afe9ea8b34ab859 (diff) | |
| parent | 69964ea4c7b68c9399f7977aa5b9aa6539a6a98a (diff) | |
Merge tag 'v3.4-rc5' into next
Linux 3.4-rc5
Merge to pull in prerequisite change for Smack:
86812bb0de1a3758dc6c7aa01a763158a7c0638a
Requested by Casey.
Diffstat (limited to 'sound/core')
| -rw-r--r-- | sound/core/vmaster.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/core/vmaster.c b/sound/core/vmaster.c index 14a286a7bf2..857586135d1 100644 --- a/sound/core/vmaster.c +++ b/sound/core/vmaster.c | |||
| @@ -419,6 +419,7 @@ EXPORT_SYMBOL(snd_ctl_make_virtual_master); | |||
| 419 | * snd_ctl_add_vmaster_hook - Add a hook to a vmaster control | 419 | * snd_ctl_add_vmaster_hook - Add a hook to a vmaster control |
| 420 | * @kcontrol: vmaster kctl element | 420 | * @kcontrol: vmaster kctl element |
| 421 | * @hook: the hook function | 421 | * @hook: the hook function |
| 422 | * @private_data: the private_data pointer to be saved | ||
| 422 | * | 423 | * |
| 423 | * Adds the given hook to the vmaster control element so that it's called | 424 | * Adds the given hook to the vmaster control element so that it's called |
| 424 | * at each time when the value is changed. | 425 | * at each time when the value is changed. |