hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'for-3.2' into for-3.3 

Conflicts:
	sound/soc/mxs/mxs-pcm.c
This commit is contained in:
Mark Brown 2011-12-11 11:24:44 +08:00
parent 7c08be84f8 9fd369b193
commit 43a9519758
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sound/soc/mxs/mxs-pcm.c
View File

@ -347,3 +347,6 @@ static struct platform_driver mxs_pcm_driver = {
};
module_platform_driver(mxs_pcm_driver);
MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:mxs-pcm-audio");

1
sound/soc/mxs/mxs-sgtl5000.c
View File

@ -161,3 +161,4 @@ module_platform_driver(mxs_sgtl5000_audio_driver);
MODULE_AUTHOR("Freescale Semiconductor, Inc.");
MODULE_DESCRIPTION("MXS ALSA SoC Machine driver");
MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:mxs-sgtl5000");