Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

[karo-tx-linux.git] / drivers / input / serio / ps2mult.c

diff --git a/drivers/input/serio/ps2mult.c b/drivers/input/serio/ps2mult.c
index 15aa81c9f1fb0215d1552bd36d22c5adf10d62c4..a76fb64f03db8fe910b4cd67688e848453489c70 100644 (file)
--- a/drivers/input/serio/ps2mult.c
+++ b/drivers/input/serio/ps2mult.c
@@ -304,15 +304,4 @@ static struct serio_driver ps2mult_drv = {
        .reconnect      = ps2mult_reconnect,
 };
 
-static int __init ps2mult_init(void)
-{
-       return serio_register_driver(&ps2mult_drv);
-}
-
-static void __exit ps2mult_exit(void)
-{
-       serio_unregister_driver(&ps2mult_drv);
-}
-
-module_init(ps2mult_init);
-module_exit(ps2mult_exit);
+module_serio_driver(ps2mult_drv);