summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRandy Dunlap <randy.dunlap@oracle.com>2008-06-17 22:19:34 +0400
committerJaroslav Kysela <perex@perex.cz>2008-06-18 11:32:04 +0400
commit1301a964cef2759d46b4ce366eeeee1f869731f9 (patch)
tree1ec9fae7db54b83e5d0518262ac7f8596e5435fa
parentf52845ad771a2b62bc06bc940f16c8f6296654ec (diff)
downloadlinux-1301a964cef2759d46b4ce366eeeee1f869731f9.tar.xz
ALSA: ASoC: fix PM=n build
Fix sound/soc build failure when CONFIG_PM=n: linux-next-20080617/sound/soc/soc-core.c:829: error: 'soc_resume_deferred' undeclared (first use in this function) soc3.out:make[3]: *** [sound/soc/soc-core.o] Error 1 Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
-rw-r--r--sound/soc/soc-core.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index b931039632c5..bdbbc6a980fa 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -825,8 +825,10 @@ static int soc_probe(struct platform_device *pdev)
/* DAPM stream work */
INIT_DELAYED_WORK(&socdev->delayed_work, close_delayed_work);
+#ifdef CONFIG_PM
/* deferred resume work */
INIT_WORK(&socdev->deferred_resume_work, soc_resume_deferred);
+#endif
return 0;