diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:36:13 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:36:13 +0100 |
commit | 843ad02fa4fb9230cd19923cc8ea1d6096cadf4e (patch) | |
tree | b9dccce37420e6fd0d2b8e65cf6526b3c9be3944 /sound/pci/ac97/ac97_codec.c | |
parent | 60c4e7c120d8cfe83fa4b0978b682b6d140483ac (diff) | |
parent | 14ab08610971eb1db572ad8ca63acd13bc4d4caf (diff) | |
download | linux-843ad02fa4fb9230cd19923cc8ea1d6096cadf4e.tar.gz linux-843ad02fa4fb9230cd19923cc8ea1d6096cadf4e.tar.bz2 linux-843ad02fa4fb9230cd19923cc8ea1d6096cadf4e.zip |
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 EXPORT_SYMBOL(snd_ac97_update_bits); -/* no lock version - see snd_ac97_updat_bits() */ +/* no lock version - see snd_ac97_update_bits() */ int snd_ac97_update_bits_nolock(struct snd_ac97 *ac97, unsigned short reg, unsigned short mask, unsigned short value) { |