diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 05e227953cf07e0dc866ac92cce6edc4f45bfa7f..dd9b2956ebc7a297fb17823c35f430812d7528ed 100644
--- a/sound/soc/codecs/Kconfig
+++ b/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/sound/soc/codecs/ad1836.c b/sound/soc/codecs/ad1836.c
index 79b9d198a61d89f137d4119fb11c79c37af16d96..3612bb92df9074f27b0739dd4ad7232cdad7e1f5 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)
 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);