diff --git a/[refs] b/[refs]
index 405fc184b3e8..787a26afde88 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 61084d992733e8f87f7278c71cdb93869fad9c17
+refs/heads/master: 7a4541a6591d8b0f6d095ffd94c8ebae75ea57d7
diff --git a/trunk/drivers/memory/emif.c b/trunk/drivers/memory/emif.c
index df0873694858..ecbc1a996eb6 100644
--- a/trunk/drivers/memory/emif.c
+++ b/trunk/drivers/memory/emif.c
@@ -1841,18 +1841,8 @@ static struct platform_driver emif_driver = {
 	},
 };
 
-static int __init_or_module emif_register(void)
-{
-	return platform_driver_probe(&emif_driver, emif_probe);
-}
-
-static void __exit emif_unregister(void)
-{
-	platform_driver_unregister(&emif_driver);
-}
+module_platform_driver_probe(emif_driver, emif_probe);
 
-module_init(emif_register);
-module_exit(emif_unregister);
 MODULE_DESCRIPTION("TI EMIF SDRAM Controller Driver");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("platform:emif");