Merge branch 'for-2.6.39' into for-2.6.40

ec5af076 · Mark Brown · b7a5d14c · 1fdf9b49 · ec5af076
Commit ec5af076 authored Apr 13, 2011 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

sound/soc/codecs/jz4740.c sound/soc/codecs/jz4740.c +0 -2

No files found.
--- 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;