diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:15 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:59 -0400 |
| commit | 07f9479a40cc778bc1462ada11f95b01360ae4ff (patch) | |
| tree | 0676cf38df3844004bb3ebfd99dfa67a4a8998f5 /include/sound/control.h | |
| parent | 9d5e6bdb3013acfb311ab407eeca0b6a6a3dedbf (diff) | |
| parent | cd2e49e90f1cae7726c9a2c54488d881d7f1cd1c (diff) | |
Merge branch 'master' into for-next
Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.
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 e67db2869360..404acb859cee 100644 --- a/include/sound/control.h +++ b/include/sound/control.h | |||
| @@ -191,7 +191,7 @@ int _snd_ctl_add_slave(struct snd_kcontrol *master, struct snd_kcontrol *slave, | |||
| 191 | * Returns zero if successful or a negative error code. | 191 | * Returns zero if successful or a negative error code. |
| 192 | * | 192 | * |
| 193 | * All slaves must be the same type (returning the same information | 193 | * All slaves must be the same type (returning the same information |
| 194 | * via info callback). The fucntion doesn't check it, so it's your | 194 | * via info callback). The function doesn't check it, so it's your |
| 195 | * responsibility. | 195 | * responsibility. |
| 196 | * | 196 | * |
| 197 | * Also, some additional limitations: | 197 | * Also, some additional limitations: |