diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /sound/core/vmaster.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'sound/core/vmaster.c')
| -rw-r--r-- | sound/core/vmaster.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/vmaster.c b/sound/core/vmaster.c index a89948ae9e8..a39d3d8c2f9 100644 --- a/sound/core/vmaster.c +++ b/sound/core/vmaster.c | |||
| @@ -233,7 +233,7 @@ static void slave_free(struct snd_kcontrol *kcontrol) | |||
| 233 | * Add a slave control to the group with the given master control | 233 | * Add a slave control to the group with the given master control |
| 234 | * | 234 | * |
| 235 | * All slaves must be the same type (returning the same information | 235 | * All slaves must be the same type (returning the same information |
| 236 | * via info callback). The fucntion doesn't check it, so it's your | 236 | * via info callback). The function doesn't check it, so it's your |
| 237 | * responsibility. | 237 | * responsibility. |
| 238 | * | 238 | * |
| 239 | * Also, some additional limitations: | 239 | * Also, some additional limitations: |