diff --git a/[refs] b/[refs]
index dd759d048898..a02c0afe665e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a25f3b292c5c70de80d2b1f1cf3f5b9aae91b86
+refs/heads/master: f68fdb9a8c3d4bc245752f4d312f7035063ab64e
diff --git a/trunk/drivers/media/video/davinci/vpss.c b/trunk/drivers/media/video/davinci/vpss.c
index 453236bd7559..7ee72ecd3d81 100644
--- a/trunk/drivers/media/video/davinci/vpss.c
+++ b/trunk/drivers/media/video/davinci/vpss.c
@@ -268,7 +268,7 @@ static int __init vpss_probe(struct platform_device *pdev)
 	return status;
 }
 
-static int vpss_remove(struct platform_device *pdev)
+static int __devexit vpss_remove(struct platform_device *pdev)
 {
 	iounmap(oper_cfg.vpss_bl_regs_base);
 	release_mem_region(oper_cfg.r1->start, oper_cfg.len1);