From 6ff07e90bb001514bea1190cead6a8e8caffdc47 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu, 13 Aug 2009 15:19:42 +0100
Subject: [PATCH] --- yaml --- r: 157641 b: refs/heads/master c:
 e9ade7f933d629698cbe5f09f1e5511269180fea h: refs/heads/master i:   157639:
 3dd701fb3141013181d6e588183857a3d503d3fa v: v3

---
 [refs]                          | 2 +-
 trunk/sound/soc/codecs/Kconfig  | 1 +
 trunk/sound/soc/codecs/ad1836.c | 5 -----
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index dc8ac1a55bfd..8cbd765e6526 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7eaae41ea54af5516138aef5fd33bc55598cbf48
+refs/heads/master: e9ade7f933d629698cbe5f09f1e5511269180fea
diff --git a/trunk/sound/soc/codecs/Kconfig b/trunk/sound/soc/codecs/Kconfig
index 05e227953cf0..dd9b2956ebc7 100644
--- a/trunk/sound/soc/codecs/Kconfig
+++ b/trunk/sound/soc/codecs/Kconfig
@@ -12,6 +12,7 @@ config SND_SOC_ALL_CODECS
 	tristate "Build all ASoC CODEC drivers"
 	select SND_SOC_L3
 	select SND_SOC_AC97_CODEC if SND_SOC_AC97_BUS
+	select SND_SOC_AD1836 if SPI_MASTER
 	select SND_SOC_AD1938 if SPI_MASTER
 	select SND_SOC_AD1980 if SND_SOC_AC97_BUS
 	select SND_SOC_AD73311 if I2C
diff --git a/trunk/sound/soc/codecs/ad1836.c b/trunk/sound/soc/codecs/ad1836.c
index 79b9d198a61d..3612bb92df90 100644
--- a/trunk/sound/soc/codecs/ad1836.c
+++ b/trunk/sound/soc/codecs/ad1836.c
@@ -418,11 +418,6 @@ static int ad1836_remove(struct platform_device *pdev)
 struct snd_soc_codec_device soc_codec_dev_ad1836 = {
 	.probe = 	ad1836_probe,
 	.remove = 	ad1836_remove,
-	/* The power management of ad1836 is very simple. There are
-	 * only adc&dac 2 components to control. Dapm handles them.
-	 */
-	.suspend =      NULL,
-	.resume =       NULL,
 };
 EXPORT_SYMBOL_GPL(soc_codec_dev_ad1836);