diff --git a/[refs] b/[refs]
index 0c2b04ad8461..215e17bd6ea5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b140b89307a59527df644100ce5ab3bc1be7d1b
+refs/heads/master: 210fa70d3aa25da78e7ca7a43d993cd2603c0540
diff --git a/trunk/drivers/media/video/davinci/vpif_display.c b/trunk/drivers/media/video/davinci/vpif_display.c
index 969d4b3aa785..8ea65d794dbf 100644
--- a/trunk/drivers/media/video/davinci/vpif_display.c
+++ b/trunk/drivers/media/video/davinci/vpif_display.c
@@ -1422,7 +1422,7 @@ static int initialize_vpif(void)
  */
 static __init int vpif_probe(struct platform_device *pdev)
 {
-	const struct subdev_info *subdevdata;
+	const struct vpif_subdev_info *subdevdata;
 	int i, j = 0, k, q, m, err = 0;
 	struct i2c_adapter *i2c_adap;
 	struct vpif_config *config;