diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 14:14:49 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 14:14:49 -0400 |
commit | 42933bac11e811f02200c944d8562a15f8ec4ff0 (patch) | |
tree | fcdd9afe56eb0e746565ddd1f92f22d36678b843 /sound/oss/ac97_codec.c | |
parent | 2b9accbee563f535046ff2cd382d0acaa92e130c (diff) | |
parent | 25985edcedea6396277003854657b5f3cb31a628 (diff) |
Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6
* 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6:
Fix common misspellings
Diffstat (limited to 'sound/oss/ac97_codec.c')
-rw-r--r-- | sound/oss/ac97_codec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/oss/ac97_codec.c b/sound/oss/ac97_codec.c index 854c303264dc..0cd23d94888f 100644 --- a/sound/oss/ac97_codec.c +++ b/sound/oss/ac97_codec.c | |||
@@ -28,7 +28,7 @@ | |||
28 | * | 28 | * |
29 | * History | 29 | * History |
30 | * May 02, 2003 Liam Girdwood <lrg@slimlogic.co.uk> | 30 | * May 02, 2003 Liam Girdwood <lrg@slimlogic.co.uk> |
31 | * Removed non existant WM9700 | 31 | * Removed non existent WM9700 |
32 | * Added support for WM9705, WM9708, WM9709, WM9710, WM9711 | 32 | * Added support for WM9705, WM9708, WM9709, WM9710, WM9711 |
33 | * WM9712 and WM9717 | 33 | * WM9712 and WM9717 |
34 | * Mar 28, 2002 Randolph Bentson <bentson@holmsjoen.com> | 34 | * Mar 28, 2002 Randolph Bentson <bentson@holmsjoen.com> |
@@ -441,7 +441,7 @@ static void ac97_set_mixer(struct ac97_codec *codec, unsigned int oss_mixer, uns | |||
441 | } | 441 | } |
442 | 442 | ||
443 | /* read or write the recmask, the ac97 can really have left and right recording | 443 | /* read or write the recmask, the ac97 can really have left and right recording |
444 | inputs independantly set, but OSS doesn't seem to want us to express that to | 444 | inputs independently set, but OSS doesn't seem to want us to express that to |
445 | the user. the caller guarantees that we have a supported bit set, and they | 445 | the user. the caller guarantees that we have a supported bit set, and they |
446 | must be holding the card's spinlock */ | 446 | must be holding the card's spinlock */ |
447 | static int ac97_recmask_io(struct ac97_codec *codec, int rw, int mask) | 447 | static int ac97_recmask_io(struct ac97_codec *codec, int rw, int mask) |
@@ -754,7 +754,7 @@ int ac97_probe_codec(struct ac97_codec *codec) | |||
754 | if((codec->codec_ops == &null_ops) && (f & 4)) | 754 | if((codec->codec_ops == &null_ops) && (f & 4)) |
755 | codec->codec_ops = &default_digital_ops; | 755 | codec->codec_ops = &default_digital_ops; |
756 | 756 | ||
757 | /* A device which thinks its a modem but isnt */ | 757 | /* A device which thinks its a modem but isn't */ |
758 | if(codec->flags & AC97_DELUDED_MODEM) | 758 | if(codec->flags & AC97_DELUDED_MODEM) |
759 | codec->modem = 0; | 759 | codec->modem = 0; |
760 | 760 | ||