diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-12-27 23:41:33 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-12-27 23:41:33 +0000 |
| commit | 4551ae0a24bba06972247a80f721fc21f6b2b758 (patch) | |
| tree | 7e17b819ba34f73988d384161335ebe5729897ad /sound/soc/mxs | |
| parent | e2c236f0a42fbb9e6a9528f8436f348218ffee96 (diff) | |
| parent | 384703b8e6cd4c8ef08512e596024e028c91c339 (diff) | |
| download | blackbird-op-linux-4551ae0a24bba06972247a80f721fc21f6b2b758.tar.gz blackbird-op-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.c | 3 | ||||
| -rw-r--r-- | sound/soc/mxs/mxs-sgtl5000.c | 1 |
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"); |
