diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-03-23 08:14:02 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-03-23 08:14:02 -0400 |
| commit | 3372dbdd8ca11f51be8c6a30b2bc79eb04c4a902 (patch) | |
| tree | d4499bf5a5665b4820ffaf96bce55bf6b895195e /include/sound/control.h | |
| parent | bc465aa9d045feb0e13b4a8f32cc33c1943f62d6 (diff) | |
| parent | 967b1307b69b8ada8b331e01046ad1ef83742e99 (diff) | |
Merge branch 'for-next' into topic/hda-core
Diffstat (limited to 'include/sound/control.h')
| -rw-r--r-- | include/sound/control.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/control.h b/include/sound/control.h index 75f3054023f7..95aad6d3fd1a 100644 --- a/include/sound/control.h +++ b/include/sound/control.h | |||
| @@ -227,7 +227,7 @@ snd_ctl_add_slave(struct snd_kcontrol *master, struct snd_kcontrol *slave) | |||
| 227 | * Add a virtual slave control to the given master. | 227 | * Add a virtual slave control to the given master. |
| 228 | * Unlike snd_ctl_add_slave(), the element added via this function | 228 | * Unlike snd_ctl_add_slave(), the element added via this function |
| 229 | * is supposed to have volatile values, and get callback is called | 229 | * is supposed to have volatile values, and get callback is called |
| 230 | * at each time quried from the master. | 230 | * at each time queried from the master. |
| 231 | * | 231 | * |
| 232 | * When the control peeks the hardware values directly and the value | 232 | * When the control peeks the hardware values directly and the value |
| 233 | * can be changed by other means than the put callback of the element, | 233 | * can be changed by other means than the put callback of the element, |