diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-05-10 11:24:50 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-05-10 11:24:50 +0400 |
| commit | 1209842af4db98ffd7364ec9cf7d1a59293aa74c (patch) | |
| tree | 33202a5468dc66456b67764eb6a272bd7e8c5af5 /sound/soc/codecs/uda134x.c | |
| parent | f0a2b0cb71e652ae9f0feeea91e5320e4faf25dc (diff) | |
| parent | f3eee00da39cba3c8a4db7048458969c620ac6d8 (diff) | |
| download | linux-1209842af4db98ffd7364ec9cf7d1a59293aa74c.tar.xz | |
Merge branch 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into topic/asoc
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 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) |