diff options
| author |   Sage Weil <sage@inktank.com> | 2013-08-15 11:11:45 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-08-15 11:11:45 -0700 |
| commit | ee3e542fec6e69bc9fb668698889a37d93950ddf (patch) | |
| tree | e74ee766a4764769ef1d3d45d266b4dea64101d3 /include/sound/control.h | |
| parent | ceph: Remove bogus check in invalidatepage (diff) | |
| parent | Merge branch 'akpm' (patches from Andrew Morton) (diff) | |
| download | wireguard-linux-ee3e542fec6e69bc9fb668698889a37d93950ddf.tar.xz wireguard-linux-ee3e542fec6e69bc9fb668698889a37d93950ddf.zip | |
Merge remote-tracking branch 'linus/master' into testing
Diffstat (limited to 'include/sound/control.h')
| -rw-r--r-- | include/sound/control.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/sound/control.h b/include/sound/control.h index 34bc93d80d55..5358892b1b39 100644 --- a/include/sound/control.h +++ b/include/sound/control.h @@ -233,7 +233,8 @@ snd_ctl_add_slave_uncached(struct snd_kcontrol *master, int snd_ctl_add_vmaster_hook(struct snd_kcontrol *kctl, void (*hook)(void *private_data, int), void *private_data); -void snd_ctl_sync_vmaster_hook(struct snd_kcontrol *kctl); +void snd_ctl_sync_vmaster(struct snd_kcontrol *kctl, bool hook_only); +#define snd_ctl_sync_vmaster_hook(kctl) snd_ctl_sync_vmaster(kctl, true) /* * Helper functions for jack-detection controls |