Merge branch 'for-2.6.39' into for-2.6.40

ec5af076 · Mark Brown · b7a5d14c · 1fdf9b49 · ec5af076
隐藏空白更改
内联并排

Showing with 0 addition and 2 deletion

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

未找到文件。
--- 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;