diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-05-22 10:01:33 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-05-22 10:01:33 +0200 |
| commit | 7ec298dfef00e2c8effe8658011e03d86911b0bf (patch) | |
| tree | dd62232006547b861a2731fe49c26367d3e9422c /sound/soc/codecs/uda134x.c | |
| parent | 02e5fbf622aabf68bdc02282a17a3aeed054237a (diff) | |
| parent | de0853c000aa3b5c9983d066c137e5dc9c8355a0 (diff) | |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'sound/soc/codecs/uda134x.c')
| -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 48ffd406a71..a7b8f301bad 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) |