summaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-core.c
diff options
context:
space:
mode:
authorMark Brown2011-02-02 11:43:26 +0100
committerMark Brown2011-02-02 11:43:26 +0100
commit88ee1c611d0ac0f771212f907bdfb33905a5dc89 (patch)
treee4a789fc24974817e17cd82bddeb3f54bf57439e /sound/soc/soc-core.c
parentMerge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/lr... (diff)
downloadkernel-qcow2-linux-88ee1c611d0ac0f771212f907bdfb33905a5dc89.tar.gz
kernel-qcow2-linux-88ee1c611d0ac0f771212f907bdfb33905a5dc89.tar.xz
kernel-qcow2-linux-88ee1c611d0ac0f771212f907bdfb33905a5dc89.zip
ASoC: Update PM ifdefs for exported suspend/resume
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/soc-core.c')
-rw-r--r--sound/soc/soc-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 205cbd7b149f..10bc3c23b525 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