summaryrefslogtreecommitdiff
path: root/sound/soc/soc-core.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-04-06 23:15:15 +0900
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-04-06 23:15:15 +0900
commitfa880004682cf0d10e7a7c71dc8d56bbd67ac3d5 (patch)
tree8d3c8786e1676569d2c82b76b47ffcc15c0f4309 /sound/soc/soc-core.c
parent09f68072b32089f2e3b4749161eb3ce954faf8d4 (diff)
parentdeb2607e6c3d75c7185bb8aba658d9cd57e6e54a (diff)
downloadlinux-3.10-fa880004682cf0d10e7a7c71dc8d56bbd67ac3d5.tar.gz
linux-3.10-fa880004682cf0d10e7a7c71dc8d56bbd67ac3d5.tar.bz2
linux-3.10-fa880004682cf0d10e7a7c71dc8d56bbd67ac3d5.zip
Merge branch 'for-2.6.39' into for-2.6.40
Diffstat (limited to 'sound/soc/soc-core.c')
-rw-r--r--sound/soc/soc-core.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 0cf699762ff..1c7e82a4c80 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -2060,6 +2060,7 @@ const struct dev_pm_ops snd_soc_pm_ops = {
.resume = snd_soc_resume,
.poweroff = snd_soc_poweroff,
};
+EXPORT_SYMBOL_GPL(snd_soc_pm_ops);
/* ASoC platform driver */
static struct platform_driver soc_driver = {