Merge branch 'for-3.2' into for-3.3

Conflicts: sound/soc/mxs/mxs-pcm.c
git-mirror · Dec 11, 2011 · 43a9519 · 43a9519
2 parents 7c08be8 + 9fd369b
commit 43a9519
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/sound/soc/mxs/mxs-pcm.c b/sound/soc/mxs/mxs-pcm.c
@@ -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");
diff --git a/sound/soc/mxs/mxs-sgtl5000.c b/sound/soc/mxs/mxs-sgtl5000.c
@@ -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");