diff --git a/[refs] b/[refs]
index e3f1a9cbf6dc..ef0ef762b94d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d7496836d10591746e0cf342377d0390c339783
+refs/heads/master: 95d158df4459016c98e8dae2229d12be09d79324
diff --git a/trunk/drivers/net/irda/au1k_ir.c b/trunk/drivers/net/irda/au1k_ir.c
index 56f1e6d6e4eb..7a1f684edcb5 100644
--- a/trunk/drivers/net/irda/au1k_ir.c
+++ b/trunk/drivers/net/irda/au1k_ir.c
@@ -953,18 +953,7 @@ static struct platform_driver au1k_irda_driver = {
 	.remove		= au1k_irda_remove,
 };
 
-static int __init au1k_irda_load(void)
-{
-	return platform_driver_register(&au1k_irda_driver);
-}
-
-static void __exit au1k_irda_unload(void)
-{
-	return platform_driver_unregister(&au1k_irda_driver);
-}
+module_platform_driver(au1k_irda_driver);
 
 MODULE_AUTHOR("Pete Popov <ppopov@mvista.com>");
 MODULE_DESCRIPTION("Au1000 IrDA Device Driver");
-
-module_init(au1k_irda_load);
-module_exit(au1k_irda_unload);