diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-13 10:00:22 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-13 10:00:22 -0500 |
| commit | 4de3a8e101150feaefa1139611a50ff37467f33e (patch) | |
| tree | daada742542518b02d7db7c5d32e715eaa5f166d /sound/soc/imx/imx-pcm-dma-mx2.c | |
| parent | 294064f58953f9964e5945424b09c51800330a83 (diff) | |
| parent | 099469502f62fbe0d7e4f0b83a2f22538367f734 (diff) | |
Merge branch 'master' into fixes
Diffstat (limited to 'sound/soc/imx/imx-pcm-dma-mx2.c')
| -rw-r--r-- | sound/soc/imx/imx-pcm-dma-mx2.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/sound/soc/imx/imx-pcm-dma-mx2.c b/sound/soc/imx/imx-pcm-dma-mx2.c index 43fdc24f7e8d..1cf2fe889f6a 100644 --- a/sound/soc/imx/imx-pcm-dma-mx2.c +++ b/sound/soc/imx/imx-pcm-dma-mx2.c | |||
| @@ -326,16 +326,6 @@ static struct platform_driver imx_pcm_driver = { | |||
| 326 | .remove = __devexit_p(imx_soc_platform_remove), | 326 | .remove = __devexit_p(imx_soc_platform_remove), |
| 327 | }; | 327 | }; |
| 328 | 328 | ||
| 329 | static int __init snd_imx_pcm_init(void) | 329 | module_platform_driver(imx_pcm_driver); |
| 330 | { | ||
| 331 | return platform_driver_register(&imx_pcm_driver); | ||
| 332 | } | ||
| 333 | module_init(snd_imx_pcm_init); | ||
| 334 | |||
| 335 | static void __exit snd_imx_pcm_exit(void) | ||
| 336 | { | ||
| 337 | platform_driver_unregister(&imx_pcm_driver); | ||
| 338 | } | ||
| 339 | module_exit(snd_imx_pcm_exit); | ||
| 340 | MODULE_LICENSE("GPL"); | 330 | MODULE_LICENSE("GPL"); |
| 341 | MODULE_ALIAS("platform:imx-pcm-audio"); | 331 | MODULE_ALIAS("platform:imx-pcm-audio"); |