diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-11 04:24:44 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-11 04:24:44 +0100 |
| commit | 43a95197581ac58081772eab3bd5f114da87f98b (patch) | |
| tree | bc03d0cd7ca07f4b345c4d54d1293bed03ebc1c4 /sound/soc | |
| parent | ASoC: Fix an obvious copy paste error in an error message (diff) | |
| parent | ASoC: mxs: Add appropriate MODULE_ALIAS() (diff) | |
| download | linux-43a95197581ac58081772eab3bd5f114da87f98b.tar.xz linux-43a95197581ac58081772eab3bd5f114da87f98b.zip | |
Merge branch 'for-3.2' into for-3.3
Conflicts:
sound/soc/mxs/mxs-pcm.c
Diffstat (limited to 'sound/soc')
| -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 = { }; 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 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); MODULE_AUTHOR("Freescale Semiconductor, Inc."); MODULE_DESCRIPTION("MXS ALSA SoC Machine driver"); MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:mxs-sgtl5000"); |