summaryrefslogtreecommitdiffstats
path: root/sound/soc/mxs
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-11 11:24:44 +0800
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-11 11:24:44 +0800
commit43a95197581ac58081772eab3bd5f114da87f98b (patch)
treebc03d0cd7ca07f4b345c4d54d1293bed03ebc1c4 /sound/soc/mxs
parent7c08be84f83b23762fb7571ac9a4aea3c34d1a66 (diff)
parent9fd369b193dceddd4e9e7f426c229c6104c80e28 (diff)
downloadop-kernel-dev-43a95197581ac58081772eab3bd5f114da87f98b.zip
op-kernel-dev-43a95197581ac58081772eab3bd5f114da87f98b.tar.gz
Merge branch 'for-3.2' into for-3.3
Conflicts: sound/soc/mxs/mxs-pcm.c
Diffstat (limited to 'sound/soc/mxs')
-rw-r--r--sound/soc/mxs/mxs-pcm.c3
-rw-r--r--sound/soc/mxs/mxs-sgtl5000.c1
2 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/mxs/mxs-pcm.c b/sound/soc/mxs/mxs-pcm.c
index 612ad3d..0e12f4e 100644
--- 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
index 200a928..259278f 100644
--- 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");
OpenPOWER on IntegriCloud