Skip to content

L
linux
Commit fa880004 authored by Mark Brown's avatar Mark Brown
Browse files
Options

Merge branch 'for-2.6.39' into for-2.6.40

parents 09f68072 deb2607e
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
sound/soc/soc-core.c
View file @ fa880004
...@@ -2060,6 +2060,7 @@ const struct dev_pm_ops snd_soc_pm_ops = { ...@@ -2060,6 +2060,7 @@ const struct dev_pm_ops snd_soc_pm_ops = {
.resume = snd_soc_resume, .resume = snd_soc_resume,
.poweroff = snd_soc_poweroff, .poweroff = snd_soc_poweroff,
}; };
EXPORT_SYMBOL_GPL(snd_soc_pm_ops);
/* ASoC platform driver */ /* ASoC platform driver */
static struct platform_driver soc_driver = { static struct platform_driver soc_driver = {
......
sound/soc/tegra/harmony.c
View file @ fa880004
...@@ -370,6 +370,7 @@ static struct platform_driver tegra_snd_harmony_driver = { ...@@ -370,6 +370,7 @@ static struct platform_driver tegra_snd_harmony_driver = {
.driver = { .driver = {
.name = DRV_NAME, .name = DRV_NAME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.pm = &snd_soc_pm_ops,
}, },
.probe = tegra_snd_harmony_probe, .probe = tegra_snd_harmony_probe,
.remove = __devexit_p(tegra_snd_harmony_remove), .remove = __devexit_p(tegra_snd_harmony_remove),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7