diff --git a/[refs] b/[refs]
index 7c207f5db4f8..fe6692d54428 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c31aeca6787d31dd4bd90bf573da944b44a2208
+refs/heads/master: 64e171e3f66d75d792029ad53d203e4c113e9f0d
diff --git a/trunk/drivers/media/platform/soc_camera/mx2_camera.c b/trunk/drivers/media/platform/soc_camera/mx2_camera.c
index 048c26a27c34..7ca9dbaa9ffa 100644
--- a/trunk/drivers/media/platform/soc_camera/mx2_camera.c
+++ b/trunk/drivers/media/platform/soc_camera/mx2_camera.c
@@ -1620,10 +1620,9 @@ static struct platform_driver mx2_camera_driver = {
 	},
 	.id_table	= mx2_camera_devtype,
 	.remove		= mx2_camera_remove,
-	.probe		= mx2_camera_probe,
 };
 
-module_platform_driver(mx2_camera_driver);
+module_platform_driver_probe(mx2_camera_driver, mx2_camera_probe);
 
 MODULE_DESCRIPTION("i.MX27 SoC Camera Host driver");
 MODULE_AUTHOR("Sascha Hauer <sha@pengutronix.de>");