diff options
| author | Mark Brown | 2011-04-13 10:33:52 -0700 |
|---|---|---|
| committer | Mark Brown | 2011-04-13 10:33:52 -0700 |
| commit | ec5af076f53da800eef939ab092561d85f162637 (patch) | |
| tree | da61e703c15278ffec1f1f4994d2458757d7d526 | |
| parent | b7a5d14c607093de1a030e9933bc8c95ab2afd3f (diff) | |
| parent | 1fdf9b49e9e7788d09bad4b08a6a821ac39798f3 (diff) | |
Merge branch 'for-2.6.39' into for-2.6.40
| -rw-r--r-- | sound/soc/codecs/jz4740.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/soc/codecs/jz4740.c b/sound/soc/codecs/jz4740.c index f7cd346fd727..f5ccdbf7ebc6 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; |