Merge branch 'for-2.6.39' into for-2.6.40

git-mirror · Apr 6, 2011 · fa88000 · fa88000
2 parents 09f6807 + deb2607
commit fa88000
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git 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 = {

diff --git a/sound/soc/tegra/harmony.c b/sound/soc/tegra/harmony.c
@@ -370,6 +370,7 @@ static struct platform_driver tegra_snd_harmony_driver = {
 	.driver = {
 		.name = DRV_NAME,
 		.owner = THIS_MODULE,
+		.pm = &snd_soc_pm_ops,
 	},
 	.probe = tegra_snd_harmony_probe,
 	.remove = __devexit_p(tegra_snd_harmony_remove),