diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-03-23 19:36:13 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-03-23 19:36:13 -0400 |
| commit | 843ad02fa4fb9230cd19923cc8ea1d6096cadf4e (patch) | |
| tree | b9dccce37420e6fd0d2b8e65cf6526b3c9be3944 /sound/pci/ac97/ac97_codec.c | |
| parent | 60c4e7c120d8cfe83fa4b0978b682b6d140483ac (diff) | |
| parent | 14ab08610971eb1db572ad8ca63acd13bc4d4caf (diff) | |
Merge branch 'topic/intel8x0' into for-linus
Diffstat (limited to 'sound/pci/ac97/ac97_codec.c')
| -rw-r--r-- | sound/pci/ac97/ac97_codec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c index 44f2381b0aed..97ee127ac33d 100644 --- a/sound/pci/ac97/ac97_codec.c +++ b/sound/pci/ac97/ac97_codec.c | |||
| @@ -384,7 +384,7 @@ int snd_ac97_update_bits(struct snd_ac97 *ac97, unsigned short reg, unsigned sho | |||
| 384 | 384 | ||
| 385 | EXPORT_SYMBOL(snd_ac97_update_bits); | 385 | EXPORT_SYMBOL(snd_ac97_update_bits); |
| 386 | 386 | ||
| 387 | /* no lock version - see snd_ac97_updat_bits() */ | 387 | /* no lock version - see snd_ac97_update_bits() */ |
| 388 | int snd_ac97_update_bits_nolock(struct snd_ac97 *ac97, unsigned short reg, | 388 | int snd_ac97_update_bits_nolock(struct snd_ac97 *ac97, unsigned short reg, |
| 389 | unsigned short mask, unsigned short value) | 389 | unsigned short mask, unsigned short value) |
| 390 | { | 390 | { |