diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-06-23 21:10:28 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-06-23 21:10:28 +0200 |
| commit | 1ae4e9b99682adfe9ae170ed593f26fe89eb65b5 (patch) | |
| tree | a8f367c65d19d54e7e624b99f36720c86bf7f067 /sound/soc/imx/imx-ssi.c | |
| parent | ASoC: Add basic WM8918 support (diff) | |
| parent | ASoC: pxa-ssp: Correct check for stream presence (diff) | |
| download | linux-1ae4e9b99682adfe9ae170ed593f26fe89eb65b5.tar.xz linux-1ae4e9b99682adfe9ae170ed593f26fe89eb65b5.zip | |
Merge branch 'for-3.0' into for-3.1
Diffstat (limited to 'sound/soc/imx/imx-ssi.c')
| -rw-r--r-- | sound/soc/imx/imx-ssi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/imx/imx-ssi.c b/sound/soc/imx/imx-ssi.c index 158a91c1efad..10a8e2783751 100644 --- a/sound/soc/imx/imx-ssi.c +++ b/sound/soc/imx/imx-ssi.c @@ -775,4 +775,4 @@ module_exit(imx_ssi_exit); MODULE_AUTHOR("Sascha Hauer, <s.hauer@pengutronix.de>"); MODULE_DESCRIPTION("i.MX I2S/ac97 SoC Interface"); MODULE_LICENSE("GPL"); - +MODULE_ALIAS("platform:imx-ssi"); |