diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-05-08 16:33:41 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-05-08 16:33:41 +0200 |
| commit | afd8f37c8054318655e4f9752d45c817a9d7cb07 (patch) | |
| tree | d96fd251f68e9fa6bf2ed0ade19b815b141973b3 /sound | |
| parent | ASoC: SSM2602: Remove unused struct and define (diff) | |
| parent | ASoC: UDA134x: Remove POWER_OFF_ON_STANDBY define. (diff) | |
| download | linux-afd8f37c8054318655e4f9752d45c817a9d7cb07.tar.xz linux-afd8f37c8054318655e4f9752d45c817a9d7cb07.zip | |
Merge branch 'for-2.6.39' into for-2.6.40
Diffstat (limited to 'sound')
| -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 = { .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) |