Merge branch 'for-2.6.39' into for-2.6.40

afd8f37c · Mark Brown · 5663940e · bf707de2 · afd8f37c
隐藏空白更改
内联并排

Showing with 0 addition and 2 deletion

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

未找到文件。
--- a/sound/soc/codecs/uda134x.c
+++ b/sound/soc/codecs/uda134x.c
@@ -601,9 +601,7 @@ static struct snd_soc_codec_driver soc_codec_dev_uda134x = {
 	.reg_cache_step = 1,
 	.read = uda134x_read_reg_cache,
 	.write = uda134x_write,
-#ifdef POWER_OFF_ON_STANDBY
 	.set_bias_level = uda134x_set_bias_level,
-#endif
 };

 static int __devinit uda134x_codec_probe(struct platform_device *pdev)