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

Commit 463f7e50 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/topic/pxa' into asoc-next

parents fbbeb391 e5b7d71a

sound/soc/pxa/brownstone.c

+1 −0
Original line number Diff line number Diff line
@@ -133,3 +133,4 @@ module_platform_driver(mmp_driver); 
MODULE_AUTHOR("Leo Yan <leoy@marvell.com>");

MODULE_DESCRIPTION("ALSA SoC Brownstone");

MODULE_LICENSE("GPL");

MODULE_ALIAS("platform:brownstone-audio");

sound/soc/pxa/mioa701_wm9713.c

+1 −0
Original line number Diff line number Diff line
@@ -207,3 +207,4 @@ module_platform_driver(mioa701_wm9713_driver); 
MODULE_AUTHOR("Robert Jarzmik (rjarzmik@free.fr)");

MODULE_DESCRIPTION("ALSA SoC WM9713 MIO A701");

MODULE_LICENSE("GPL");

MODULE_ALIAS("platform:mioa701-wm9713");

sound/soc/pxa/mmp-pcm.c

+1 −0
Original line number Diff line number Diff line
@@ -248,3 +248,4 @@ module_platform_driver(mmp_pcm_driver); 
MODULE_AUTHOR("Leo Yan <leoy@marvell.com>");

MODULE_DESCRIPTION("MMP Soc Audio DMA module");

MODULE_LICENSE("GPL");

MODULE_ALIAS("platform:mmp-pcm-audio");

sound/soc/pxa/mmp-sspa.c

+1 −0
Original line number Diff line number Diff line
@@ -482,3 +482,4 @@ module_platform_driver(asoc_mmp_sspa_driver); 
MODULE_AUTHOR("Leo Yan <leoy@marvell.com>");

MODULE_DESCRIPTION("MMP SSPA SoC Interface");

MODULE_LICENSE("GPL");

MODULE_ALIAS("platform:mmp-sspa-dai");

sound/soc/pxa/palm27x.c

+1 −0
Original line number Diff line number Diff line
@@ -161,3 +161,4 @@ module_platform_driver(palm27x_wm9712_driver); 
MODULE_AUTHOR("Marek Vasut <marek.vasut@gmail.com>");

MODULE_DESCRIPTION("ALSA SoC Palm T|X, T5 and LifeDrive");

MODULE_LICENSE("GPL");

MODULE_ALIAS("platform:palm27x-asoc");