diff --git a/[refs] b/[refs]
index dfd7b26810e3..7c207f5db4f8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2400a1f89d329ad8948c08e6e08fef33ce42f73b
+refs/heads/master: 8c31aeca6787d31dd4bd90bf573da944b44a2208
diff --git a/trunk/drivers/media/platform/soc_camera/atmel-isi.c b/trunk/drivers/media/platform/soc_camera/atmel-isi.c
index c314ff9b98dc..e7ccc5e7bf39 100644
--- a/trunk/drivers/media/platform/soc_camera/atmel-isi.c
+++ b/trunk/drivers/media/platform/soc_camera/atmel-isi.c
@@ -1074,7 +1074,6 @@ static int atmel_isi_probe(struct platform_device *pdev)
 }
 
 static struct platform_driver atmel_isi_driver = {
-	.probe		= atmel_isi_probe,
 	.remove		= atmel_isi_remove,
 	.driver		= {
 		.name = "atmel_isi",
@@ -1082,17 +1081,7 @@ static struct platform_driver atmel_isi_driver = {
 	},
 };
 
-static int __init atmel_isi_init_module(void)
-{
-	return  platform_driver_probe(&atmel_isi_driver, &atmel_isi_probe);
-}
-
-static void __exit atmel_isi_exit(void)
-{
-	platform_driver_unregister(&atmel_isi_driver);
-}
-module_init(atmel_isi_init_module);
-module_exit(atmel_isi_exit);
+module_platform_driver_probe(atmel_isi_driver, atmel_isi_probe);
 
 MODULE_AUTHOR("Josh Wu <josh.wu@atmel.com>");
 MODULE_DESCRIPTION("The V4L2 driver for Atmel Linux");