Merge branch 'for-2.6.39' into for-2.6.40

2011-04-06 23:15:15 +09:00
parent 09f68072b3 deb2607e6c
commit fa88000468
2 changed files with 2 additions and 0 deletions
--- 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 = {