diff --git a/[refs] b/[refs]
index c733a866564c..64e2942f8d49 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9d8938248c3b67904a8108a6fc3dcceb9d7f2aad
+refs/heads/master: 0b0a860fec1a6d4cdcd0dc5241390d083a82c00d
diff --git a/trunk/drivers/media/video/davinci/vpif.c b/trunk/drivers/media/video/davinci/vpif.c
index 3b8eac31ecae..1f532e31cd49 100644
--- a/trunk/drivers/media/video/davinci/vpif.c
+++ b/trunk/drivers/media/video/davinci/vpif.c
@@ -266,7 +266,7 @@ static int __init vpif_probe(struct platform_device *pdev)
 	return status;
 }
 
-static int vpif_remove(struct platform_device *pdev)
+static int __devexit vpif_remove(struct platform_device *pdev)
 {
 	iounmap(vpif_base);
 	release_mem_region(res->start, res_len);