]> err.no Git - linux-2.6/commitdiff
ALSA: ASoC: fix PM=n build
authorRandy Dunlap <randy.dunlap@oracle.com>
Tue, 17 Jun 2008 18:19:34 +0000 (19:19 +0100)
committerJaroslav Kysela <perex@perex.cz>
Wed, 18 Jun 2008 07:32:04 +0000 (09:32 +0200)
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>
sound/soc/soc-core.c

index b931039632c59e548ce687e75c8c8b6d4a26c44a..bdbbc6a980fa4b193765346df3f28103e2223238 100644 (file)
@@ -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;