Skip to content

Commit

Permalink
Merge branch 'for-2.6.39' into for-2.6.40
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark Brown committed Apr 13, 2011
2 parents b7a5d14 + 1fdf9b4 commit ec5af07
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions sound/soc/codecs/jz4740.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit ec5af07

Please sign in to comment.