summaryrefslogtreecommitdiffstats
path: root/sound/soc/mxs
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-12-28 00:41:33 +0100
committerArnd Bergmann <arnd@arndb.de>2011-12-28 00:41:33 +0100
commit4551ae0a24bba06972247a80f721fc21f6b2b758 (patch)
tree7e17b819ba34f73988d384161335ebe5729897ad /sound/soc/mxs
parentMerge branch 'tegra/drivers' into next/drivers (diff)
parentLinux 3.2-rc6 (diff)
downloadlinux-4551ae0a24bba06972247a80f721fc21f6b2b758.tar.xz
linux-4551ae0a24bba06972247a80f721fc21f6b2b758.zip
Merge branch 'v3.2-rc6' into next/drivers
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 dea5aa4aa647..f39d7dd9fbcb 100644
--- a/sound/soc/mxs/mxs-pcm.c
+++ b/sound/soc/mxs/mxs-pcm.c
@@ -357,3 +357,6 @@ static void __exit snd_mxs_pcm_exit(void)
platform_driver_unregister(&mxs_pcm_driver);
}
module_exit(snd_mxs_pcm_exit);
+
+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 7fbeaec06eb4..1c57f6630a48 100644
--- a/sound/soc/mxs/mxs-sgtl5000.c
+++ b/sound/soc/mxs/mxs-sgtl5000.c
@@ -171,3 +171,4 @@ module_exit(mxs_sgtl5000_exit);
MODULE_AUTHOR("Freescale Semiconductor, Inc.");
MODULE_DESCRIPTION("MXS ALSA SoC Machine driver");
MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:mxs-sgtl5000");