Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa880004 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-2.6.39' into for-2.6.40

parents 09f68072 deb2607e

sound/soc/soc-core.c

+1 −0
Original line number Diff line number Diff line
@@ -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 = {

sound/soc/tegra/harmony.c

+1 −0
Original line number Diff line number Diff line
@@ -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),