aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-08-13 10:19:42 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-08-13 10:19:42 -0400
commite9ade7f933d629698cbe5f09f1e5511269180fea (patch)
treefe61d8c2ec49c6078ac7b7b2773d0720ec98ad05 /sound
parent7eaae41ea54af5516138aef5fd33bc55598cbf48 (diff)
ASoC: Minor cleanups to AD1938 driver
- Build in SND_SOC_ALL_CODECS. - Remove null suspend/resume stuff. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/Kconfig1
-rw-r--r--sound/soc/codecs/ad1836.c5
2 files changed, 1 insertions, 5 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 05e227953cf0..dd9b2956ebc7 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -12,6 +12,7 @@ config SND_SOC_ALL_CODECS
12 tristate "Build all ASoC CODEC drivers" 12 tristate "Build all ASoC CODEC drivers"
13 select SND_SOC_L3 13 select SND_SOC_L3
14 select SND_SOC_AC97_CODEC if SND_SOC_AC97_BUS 14 select SND_SOC_AC97_CODEC if SND_SOC_AC97_BUS
15 select SND_SOC_AD1836 if SPI_MASTER
15 select SND_SOC_AD1938 if SPI_MASTER 16 select SND_SOC_AD1938 if SPI_MASTER
16 select SND_SOC_AD1980 if SND_SOC_AC97_BUS 17 select SND_SOC_AD1980 if SND_SOC_AC97_BUS
17 select SND_SOC_AD73311 if I2C 18 select SND_SOC_AD73311 if I2C
diff --git a/sound/soc/codecs/ad1836.c b/sound/soc/codecs/ad1836.c
index 79b9d198a61d..3612bb92df90 100644
--- a/sound/soc/codecs/ad1836.c
+++ b/sound/soc/codecs/ad1836.c
@@ -418,11 +418,6 @@ static int ad1836_remove(struct platform_device *pdev)
418struct snd_soc_codec_device soc_codec_dev_ad1836 = { 418struct snd_soc_codec_device soc_codec_dev_ad1836 = {
419 .probe = ad1836_probe, 419 .probe = ad1836_probe,
420 .remove = ad1836_remove, 420 .remove = ad1836_remove,
421 /* The power management of ad1836 is very simple. There are
422 * only adc&dac 2 components to control. Dapm handles them.
423 */
424 .suspend = NULL,
425 .resume = NULL,
426}; 421};
427EXPORT_SYMBOL_GPL(soc_codec_dev_ad1836); 422EXPORT_SYMBOL_GPL(soc_codec_dev_ad1836);
428 423