diff --git a/[refs] b/[refs]
index 3d6629db29fb..f46efee5bedc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 32d640dea87bc973b91975ea408a04c6dcca3f45
+refs/heads/master: 7f2b3a7d8c8dbf3c9f70561f8a6d3a85b36cd16b
diff --git a/trunk/drivers/media/platform/blackfin/bfin_capture.c b/trunk/drivers/media/platform/blackfin/bfin_capture.c
index cb2eb26850b1..ec476ef5b709 100644
--- a/trunk/drivers/media/platform/blackfin/bfin_capture.c
+++ b/trunk/drivers/media/platform/blackfin/bfin_capture.c
@@ -1050,19 +1050,7 @@ static struct platform_driver bcap_driver = {
 	.probe = bcap_probe,
 	.remove = __devexit_p(bcap_remove),
 };
-
-static __init int bcap_init(void)
-{
-	return platform_driver_register(&bcap_driver);
-}
-
-static __exit void bcap_exit(void)
-{
-	platform_driver_unregister(&bcap_driver);
-}
-
-module_init(bcap_init);
-module_exit(bcap_exit);
+module_platform_driver(bcap_driver);
 
 MODULE_DESCRIPTION("Analog Devices blackfin video capture driver");
 MODULE_AUTHOR("Scott Jiang <Scott.Jiang.Linux@gmail.com>");