diff options
author | Randy Dunlap <randy.dunlap@oracle.com> | 2008-06-17 14:19:34 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2008-06-18 03:32:04 -0400 |
commit | 1301a964cef2759d46b4ce366eeeee1f869731f9 (patch) | |
tree | 1ec9fae7db54b83e5d0518262ac7f8596e5435fa /sound | |
parent | f52845ad771a2b62bc06bc940f16c8f6296654ec (diff) |
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>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/soc-core.c | 2 |
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) | |||
825 | 825 | ||
826 | /* DAPM stream work */ | 826 | /* DAPM stream work */ |
827 | INIT_DELAYED_WORK(&socdev->delayed_work, close_delayed_work); | 827 | INIT_DELAYED_WORK(&socdev->delayed_work, close_delayed_work); |
828 | #ifdef CONFIG_PM | ||
828 | /* deferred resume work */ | 829 | /* deferred resume work */ |
829 | INIT_WORK(&socdev->deferred_resume_work, soc_resume_deferred); | 830 | INIT_WORK(&socdev->deferred_resume_work, soc_resume_deferred); |
831 | #endif | ||
830 | 832 | ||
831 | return 0; | 833 | return 0; |
832 | 834 | ||