diff --git a/[refs] b/[refs]
index 66dcf2651af8..2be5eb838ef2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 09f68072b32089f2e3b4749161eb3ce954faf8d4
+refs/heads/master: fa880004682cf0d10e7a7c71dc8d56bbd67ac3d5
diff --git a/trunk/sound/soc/soc-core.c b/trunk/sound/soc/soc-core.c
index 0cf699762ff7..1c7e82a4c808 100644
--- a/trunk/sound/soc/soc-core.c
+++ b/trunk/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/trunk/sound/soc/tegra/harmony.c b/trunk/sound/soc/tegra/harmony.c
index 8585957477eb..556a57133925 100644
--- a/trunk/sound/soc/tegra/harmony.c
+++ b/trunk/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),