diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-05-08 10:33:41 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-05-08 10:33:41 -0400 |
| commit | afd8f37c8054318655e4f9752d45c817a9d7cb07 (patch) | |
| tree | d96fd251f68e9fa6bf2ed0ade19b815b141973b3 | |
| parent | 5663940e2a9a9c9031cdba9ca170060de14da83f (diff) | |
| parent | bf707de21fec7bb203dace2d0a2bbd124d1b36ca (diff) | |
Merge branch 'for-2.6.39' into for-2.6.40
| -rw-r--r-- | sound/soc/codecs/uda134x.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/soc/codecs/uda134x.c b/sound/soc/codecs/uda134x.c index 48ffd406a71d..a7b8f301bad3 100644 --- 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 = { | |||
| 601 | .reg_cache_step = 1, | 601 | .reg_cache_step = 1, |
| 602 | .read = uda134x_read_reg_cache, | 602 | .read = uda134x_read_reg_cache, |
| 603 | .write = uda134x_write, | 603 | .write = uda134x_write, |
| 604 | #ifdef POWER_OFF_ON_STANDBY | ||
| 605 | .set_bias_level = uda134x_set_bias_level, | 604 | .set_bias_level = uda134x_set_bias_level, |
| 606 | #endif | ||
| 607 | }; | 605 | }; |
| 608 | 606 | ||
| 609 | static int __devinit uda134x_codec_probe(struct platform_device *pdev) | 607 | static int __devinit uda134x_codec_probe(struct platform_device *pdev) |