diff options
author | Takashi Iwai <tiwai@suse.de> | 2008-10-31 14:39:49 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-10-31 14:39:49 +0100 |
commit | 04172c0b9ea5861e5cba7909da5297b3aedac9e1 (patch) | |
tree | 5a993adb827ae676166ad11f7510ff57ebda46b8 /sound/soc/codecs/wm9713.c | |
parent | 5b99e6ccf964e733f0afe2b7bd09559a51a540ca (diff) | |
parent | 13d622b33dfbd99205a7add5751ba47445e480a6 (diff) | |
download | linux-stable-04172c0b9ea5861e5cba7909da5297b3aedac9e1.tar.gz linux-stable-04172c0b9ea5861e5cba7909da5297b3aedac9e1.tar.bz2 linux-stable-04172c0b9ea5861e5cba7909da5297b3aedac9e1.zip |
Merge branch 'topic/fix/asoc' into topic/asoc
Diffstat (limited to 'sound/soc/codecs/wm9713.c')
-rw-r--r-- | sound/soc/codecs/wm9713.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c index 3214aa503ead..740bf3cde18d 100644 --- a/sound/soc/codecs/wm9713.c +++ b/sound/soc/codecs/wm9713.c @@ -140,7 +140,7 @@ SOC_SINGLE("Capture ADC Boost (+20dB) Switch", AC97_VIDEO, 6, 1, 0), SOC_SINGLE("ALC Target Volume", AC97_CODEC_CLASS_REV, 12, 15, 0), SOC_SINGLE("ALC Hold Time", AC97_CODEC_CLASS_REV, 8, 15, 0), -SOC_SINGLE("ALC Decay Time ", AC97_CODEC_CLASS_REV, 4, 15, 0), +SOC_SINGLE("ALC Decay Time", AC97_CODEC_CLASS_REV, 4, 15, 0), SOC_SINGLE("ALC Attack Time", AC97_CODEC_CLASS_REV, 0, 15, 0), SOC_ENUM("ALC Function", wm9713_enum[6]), SOC_SINGLE("ALC Max Volume", AC97_PCI_SVID, 11, 7, 0), |