diff options
author | Paul Mackerras <paulus@samba.org> | 2007-05-10 07:08:37 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-05-10 07:08:37 -0400 |
commit | 2ecf042ef530dd0943e41d84b6344f507941af3e (patch) | |
tree | 73100361dd74e3f80f14c7c81ba4675948983f44 /sound/oss/pas2_pcm.c | |
parent | 32a56ebb24f23da1bbaf24292acf85b6c04526ab (diff) | |
parent | de5603748af8bf7deac403e6ba92887f8d18e812 (diff) |
Merge branch 'linux-2.6'
Diffstat (limited to 'sound/oss/pas2_pcm.c')
-rw-r--r-- | sound/oss/pas2_pcm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/pas2_pcm.c b/sound/oss/pas2_pcm.c index 4af6aafa3d86..36c3ea62086b 100644 --- a/sound/oss/pas2_pcm.c +++ b/sound/oss/pas2_pcm.c | |||
@@ -85,7 +85,7 @@ static int pcm_set_speed(int arg) | |||
85 | * come from the SDK found on ftp.uwp.edu:/pub/msdos/proaudio/. | 85 | * come from the SDK found on ftp.uwp.edu:/pub/msdos/proaudio/. |
86 | * | 86 | * |
87 | * I cleared bit 5 of these values, since that bit controls the master | 87 | * I cleared bit 5 of these values, since that bit controls the master |
88 | * mute flag. (Olav W๖lfelschneider) | 88 | * mute flag. (Olav Wรถlfelschneider) |
89 | * | 89 | * |
90 | */ | 90 | */ |
91 | #if !defined NO_AUTO_FILTER_SET | 91 | #if !defined NO_AUTO_FILTER_SET |