Merge commit 'v3.3-rc6' into next

1 files changed, 13 insertions, 1 deletions

diff --git a/drivers/input/serio/at32psif.c b/drivers/input/serio/at32psif.c
index d0d861fb5b8b..36e799c31f5e 100644
--- a/drivers/input/serio/at32psif.c
+++ b/drivers/input/serio/at32psif.c
@@ -358,7 +358,19 @@ static struct platform_driver psif_driver = {
                 .pm     = &psif_pm_ops,
         },
 };
-module_platform_driver(psif_driver);
+
+static int __init psif_init(void)
+{
+        return platform_driver_probe(&psif_driver, psif_probe);
+}
+
+static void __exit psif_exit(void)
+{
+        platform_driver_unregister(&psif_driver);
+}
+
+module_init(psif_init);
+module_exit(psif_exit);
 
 MODULE_AUTHOR("Hans-Christian Egtvedt <egtvedt@samfundet.no>");
 MODULE_DESCRIPTION("Atmel AVR32 PSIF PS/2 driver");