Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-09 15:29:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'for-2.6.39' into for-2.6.40

Browse Source
This commit is contained in:
Mark Brown 2011-04-06 23:15:15 +09:00
commit fa88000468
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sound/soc/soc-core.c
View File

@ -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 = {

1
sound/soc/tegra/harmony.c
View File

@ -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),