From: Randy Dunlap Date: Tue, 17 Jun 2008 18:19:34 +0000 (+0100) Subject: ALSA: ASoC: fix PM=n build X-Git-Tag: v2.6.27-rc1~1111^2~68 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=1301a964cef2759d46b4ce366eeeee1f869731f9;p=linux-2.6-omap-h63xx.git 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 Signed-off-by: Mark Brown Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela --- diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index b931039632c..bdbbc6a980f 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;