From c705320a86ca0d649ff70cc455bd1349d5157440 Mon Sep 17 00:00:00 2001
From: Leon Romanovsky <leon@leon.nu>
Date: Wed, 16 Nov 2011 12:07:00 +0200
Subject: [PATCH] --- yaml --- r: 283724 b: refs/heads/master c:
 c9be8427b1dbd5e9d0313762fb80b2633abb694b h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/sound/soc/codecs/alc5632.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 81f46392d358..b362f0be15dc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6662ff5c3b8efe8c107118d9506ad65daf3e3a1b
+refs/heads/master: c9be8427b1dbd5e9d0313762fb80b2633abb694b
diff --git a/trunk/sound/soc/codecs/alc5632.c b/trunk/sound/soc/codecs/alc5632.c
index 07e958aeea5c..e560a2119b12 100644
--- a/trunk/sound/soc/codecs/alc5632.c
+++ b/trunk/sound/soc/codecs/alc5632.c
@@ -939,6 +939,7 @@ static struct snd_soc_dai_driver alc5632_dai = {
 	.symmetric_rates = 1,
 };
 
+#ifdef CONFIG_PM
 static int alc5632_suspend(struct snd_soc_codec *codec, pm_message_t mesg)
 {
 	alc5632_set_bias_level(codec, SND_SOC_BIAS_OFF);
@@ -961,6 +962,10 @@ static int alc5632_resume(struct snd_soc_codec *codec)
 	alc5632_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 	return 0;
 }
+#else
+#define	alc5632_suspend	NULL
+#define	alc5632_resume	NULL
+#endif
 
 static int alc5632_probe(struct snd_soc_codec *codec)
 {