Merge branch 'stable/for-linus-fixes-3.3' of git://git.kernel.org/pub/scm/linux/kerne...

[deliverable/linux.git] / sound / soc / samsung / lowland.c

diff --git a/sound/soc/samsung/lowland.c b/sound/soc/samsung/lowland.c
index eff1b4b65df46622e0d9cca675d82133cc9128b1..4adff934f771e8ef18741e8b009c4b7eb25628b5 100644 (file)
--- a/sound/soc/samsung/lowland.c
+++ b/sound/soc/samsung/lowland.c
@@ -177,6 +177,7 @@ static struct snd_soc_dapm_route audio_paths[] = {
 
 static struct snd_soc_card lowland = {
        .name = "Lowland",
+       .owner = THIS_MODULE,
        .dai_link = lowland_dai,
        .num_links = ARRAY_SIZE(lowland_dai),
        .aux_dev = lowland_aux_dev,
@@ -228,17 +229,7 @@ static struct platform_driver lowland_driver = {
        .remove = __devexit_p(lowland_remove),
 };
 
-static int __init lowland_audio_init(void)
-{
-       return platform_driver_register(&lowland_driver);
-}
-module_init(lowland_audio_init);
-
-static void __exit lowland_audio_exit(void)
-{
-       platform_driver_unregister(&lowland_driver);
-}
-module_exit(lowland_audio_exit);
+module_platform_driver(lowland_driver);
 
 MODULE_DESCRIPTION("Lowland audio support");
 MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>");