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/oss/sb_ess.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/oss/sb_ess.c')
| -rw-r--r-- | sound/oss/sb_ess.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/sb_ess.c b/sound/oss/sb_ess.c index 9890cf2066f..5c773dff5ac 100644 --- a/sound/oss/sb_ess.c +++ b/sound/oss/sb_ess.c | |||
| @@ -168,7 +168,7 @@ | |||
| 168 | * corresponding playback levels, unless recmask says they aren't recorded. In | 168 | * corresponding playback levels, unless recmask says they aren't recorded. In |
| 169 | * the latter case the recording volumes are 0. | 169 | * the latter case the recording volumes are 0. |
| 170 | * Now recording levels of inputs can be controlled, by changing the playback | 170 | * Now recording levels of inputs can be controlled, by changing the playback |
| 171 | * levels. Futhermore several devices can be recorded together (which is not | 171 | * levels. Furthermore several devices can be recorded together (which is not |
| 172 | * possible with the ES1688). | 172 | * possible with the ES1688). |
| 173 | * Besides the separate recording level control for each input, the common | 173 | * Besides the separate recording level control for each input, the common |
| 174 | * recording level can also be controlled by RECLEV as described above. | 174 | * recording level can also be controlled by RECLEV as described above. |