Merge branch '3.3-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target...

[~andy/linux] / sound / mips / hal2.c

diff --git a/sound/mips/hal2.c b/sound/mips/hal2.c
index 2e6c85894e0be4481bf4d37994f4abfb5e21f780..5f88d1f09ffeef01f3fd9d0cc1a5746972ec1e90 100644 (file)
--- a/sound/mips/hal2.c
+++ b/sound/mips/hal2.c
@@ -935,15 +935,4 @@ static struct platform_driver hal2_driver = {
        }
 };
 
-static int __init alsa_card_hal2_init(void)
-{
-       return platform_driver_register(&hal2_driver);
-}
-
-static void __exit alsa_card_hal2_exit(void)
-{
-       platform_driver_unregister(&hal2_driver);
-}
-
-module_init(alsa_card_hal2_init);
-module_exit(alsa_card_hal2_exit);
+module_platform_driver(hal2_driver);