diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-10 22:24:44 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-10 22:24:44 -0500 |
commit | 43a95197581ac58081772eab3bd5f114da87f98b (patch) | |
tree | bc03d0cd7ca07f4b345c4d54d1293bed03ebc1c4 /sound/soc/mxs | |
parent | 7c08be84f83b23762fb7571ac9a4aea3c34d1a66 (diff) | |
parent | 9fd369b193dceddd4e9e7f426c229c6104c80e28 (diff) |
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.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 612ad3d9052d..0e12f4e0a76d 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 = { | |||
347 | }; | 347 | }; |
348 | 348 | ||
349 | module_platform_driver(mxs_pcm_driver); | 349 | module_platform_driver(mxs_pcm_driver); |
350 | |||
351 | MODULE_LICENSE("GPL"); | ||
352 | MODULE_ALIAS("platform:mxs-pcm-audio"); | ||
diff --git a/sound/soc/mxs/mxs-sgtl5000.c b/sound/soc/mxs/mxs-sgtl5000.c index 200a9282b7cc..259278f95cdf 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); | |||
161 | MODULE_AUTHOR("Freescale Semiconductor, Inc."); | 161 | MODULE_AUTHOR("Freescale Semiconductor, Inc."); |
162 | MODULE_DESCRIPTION("MXS ALSA SoC Machine driver"); | 162 | MODULE_DESCRIPTION("MXS ALSA SoC Machine driver"); |
163 | MODULE_LICENSE("GPL"); | 163 | MODULE_LICENSE("GPL"); |
164 | MODULE_ALIAS("platform:mxs-sgtl5000"); | ||