diff --git a/[refs] b/[refs]
index bd4880014d9f..c733a866564c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 50e55fd13fcf2d098e2b969c9d1bc270ae5f8b12
+refs/heads/master: 9d8938248c3b67904a8108a6fc3dcceb9d7f2aad
diff --git a/trunk/drivers/media/video/davinci/vpfe_capture.c b/trunk/drivers/media/video/davinci/vpfe_capture.c
index f2d3c9b6df10..87e97962ff57 100644
--- a/trunk/drivers/media/video/davinci/vpfe_capture.c
+++ b/trunk/drivers/media/video/davinci/vpfe_capture.c
@@ -2090,7 +2090,7 @@ static __init int vpfe_probe(struct platform_device *pdev)
 /*
  * vpfe_remove : It un-register device from V4L2 driver
  */
-static int vpfe_remove(struct platform_device *pdev)
+static int __devexit vpfe_remove(struct platform_device *pdev)
 {
 	struct vpfe_device *vpfe_dev = platform_get_drvdata(pdev);
 	struct resource *res;