diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-06 23:15:15 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-06 23:15:15 +0900 |
| commit | fa880004682cf0d10e7a7c71dc8d56bbd67ac3d5 (patch) | |
| tree | 8d3c8786e1676569d2c82b76b47ffcc15c0f4309 | |
| parent | 09f68072b32089f2e3b4749161eb3ce954faf8d4 (diff) | |
| parent | deb2607e6c3d75c7185bb8aba658d9cd57e6e54a (diff) | |
| download | linux-stable-fa880004682cf0d10e7a7c71dc8d56bbd67ac3d5.tar.gz linux-stable-fa880004682cf0d10e7a7c71dc8d56bbd67ac3d5.tar.bz2 linux-stable-fa880004682cf0d10e7a7c71dc8d56bbd67ac3d5.zip | |
Merge branch 'for-2.6.39' into for-2.6.40
| -rw-r--r-- | sound/soc/soc-core.c | 1 | ||||
| -rw-r--r-- | sound/soc/tegra/harmony.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 0cf699762ff7..1c7e82a4c808 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 = { diff --git a/sound/soc/tegra/harmony.c b/sound/soc/tegra/harmony.c index 8585957477eb..556a57133925 100644 --- 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), |