diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-09-18 15:09:44 +0100 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-09-18 15:09:44 +0100 |
commit | 9f072b7b2260a588bfb5fb43418c3358104e7c13 (patch) | |
tree | 055f1082093bb63a34c7bfe43c845567685d4675 /sound/soc/codecs/wm8350.c | |
parent | b1cd6b9ec7c749ddfad628c8c12659591ae195e6 (diff) | |
parent | 0c31cf3e4af79ea18bbd365b07ef0de207673894 (diff) | |
download | blackbird-op-linux-9f072b7b2260a588bfb5fb43418c3358104e7c13.tar.gz blackbird-op-linux-9f072b7b2260a588bfb5fb43418c3358104e7c13.zip |
Merge branch 'for-2.6.32' into for-2.6.33
Diffstat (limited to 'sound/soc/codecs/wm8350.c')
-rw-r--r-- | sound/soc/codecs/wm8350.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c index 0ebd99b7493e..3f7e8a8b387e 100644 --- a/sound/soc/codecs/wm8350.c +++ b/sound/soc/codecs/wm8350.c @@ -612,7 +612,7 @@ SOC_DAPM_SINGLE("Switch", WM8350_BEEP_VOLUME, 15, 1, 1); /* Out4 Capture Mux */ static const struct snd_kcontrol_new wm8350_out4_capture_controls = -SOC_DAPM_ENUM("Route", wm8350_enum[8]); +SOC_DAPM_ENUM("Route", wm8350_enum[7]); static const struct snd_soc_dapm_widget wm8350_dapm_widgets[] = { |