* [PATCH] ASoC: fix build with PM_SLEEP unset
@ 2011-02-03 8:32 Guennadi Liakhovetski
2011-02-03 9:27 ` Mark Brown
0 siblings, 1 reply; 2+ messages in thread
From: Guennadi Liakhovetski @ 2011-02-03 8:32 UTC (permalink / raw)
To: alsa-devel; +Cc: Mark Brown, Liam Girdwood
Fix a wrong preprocessor conditional, that leads to soc-core.c compilation
failure with CONFIG_PM set and CONFIG_PM_SLEEP unset.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 205cbd7..10bc3c2 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1801,7 +1801,7 @@ static void snd_soc_instantiate_card(struct snd_soc_card *card)
}
card->snd_card->dev = card->dev;
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
/* deferred resume work */
INIT_WORK(&card->deferred_resume_work, soc_resume_deferred);
#endif
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] ASoC: fix build with PM_SLEEP unset
2011-02-03 8:32 [PATCH] ASoC: fix build with PM_SLEEP unset Guennadi Liakhovetski
@ 2011-02-03 9:27 ` Mark Brown
0 siblings, 0 replies; 2+ messages in thread
From: Mark Brown @ 2011-02-03 9:27 UTC (permalink / raw)
To: Guennadi Liakhovetski; +Cc: alsa-devel, Liam Girdwood
On Thu, Feb 03, 2011 at 09:32:29AM +0100, Guennadi Liakhovetski wrote:
> -#ifdef CONFIG_PM
> +#ifdef CONFIG_PM_SLEEP
> /* deferred resume work */
> INIT_WORK(&card->deferred_resume_work, soc_resume_deferred);
> #endif
This change is already present in current code.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-02-03 9:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-03 8:32 [PATCH] ASoC: fix build with PM_SLEEP unset Guennadi Liakhovetski
2011-02-03 9:27 ` Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).