diff --git a/[refs] b/[refs]
index a61f292d128b..8cd8ffb4900b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 01c8132303ea5ea237cdc85ae7f144f62747910b
+refs/heads/master: 18ace0e27395423b40352ff24c7792f4c0313e24
diff --git a/trunk/drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c b/trunk/drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c
index 7b351717bcbb..c7ae7d76bb8e 100644
--- a/trunk/drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c
+++ b/trunk/drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c
@@ -719,22 +719,4 @@ static struct platform_driver vpfe_driver = {
 	.remove = vpfe_remove,
 };
 
-/**
- * vpfe_init : This function registers device driver
- */
-static __init int vpfe_init(void)
-{
-	/* Register driver to the kernel */
-	return platform_driver_register(&vpfe_driver);
-}
-
-/**
- * vpfe_cleanup : This function un-registers device driver
- */
-static void vpfe_cleanup(void)
-{
-	platform_driver_unregister(&vpfe_driver);
-}
-
-module_init(vpfe_init);
-module_exit(vpfe_cleanup);
+module_platform_driver(vpfe_driver);