summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-04-13 10:33:52 -0700
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-04-13 10:33:52 -0700
commitec5af076f53da800eef939ab092561d85f162637 (patch)
treeda61e703c15278ffec1f1f4994d2458757d7d526 /sound
parentb7a5d14c607093de1a030e9933bc8c95ab2afd3f (diff)
parent1fdf9b49e9e7788d09bad4b08a6a821ac39798f3 (diff)
downloadlinux-3.10-ec5af076f53da800eef939ab092561d85f162637.tar.gz
linux-3.10-ec5af076f53da800eef939ab092561d85f162637.tar.bz2
linux-3.10-ec5af076f53da800eef939ab092561d85f162637.zip
Merge branch 'for-2.6.39' into for-2.6.40
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/jz4740.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/soc/codecs/jz4740.c b/sound/soc/codecs/jz4740.c
index f7cd346fd72..f5ccdbf7ebc 100644
--- a/sound/soc/codecs/jz4740.c
+++ b/sound/soc/codecs/jz4740.c
@@ -308,8 +308,6 @@ static int jz4740_codec_dev_probe(struct snd_soc_codec *codec)
snd_soc_dapm_add_routes(dapm, jz4740_codec_dapm_routes,
ARRAY_SIZE(jz4740_codec_dapm_routes));
- snd_soc_dapm_new_widgets(codec);
-
jz4740_codec_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
return 0;