diff --git a/[refs] b/[refs]
index 9cf414c44f71..829dbcd0c481 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 28f4ddd1e8e341907d8f4f4b9ebf9f441f30420a
+refs/heads/master: 934949d816004ff66e21adbab225e9cb7f20015a
diff --git a/trunk/drivers/media/video/davinci/vpif_display.c b/trunk/drivers/media/video/davinci/vpif_display.c
index c015da813dda..d14cfb200ed0 100644
--- a/trunk/drivers/media/video/davinci/vpif_display.c
+++ b/trunk/drivers/media/video/davinci/vpif_display.c
@@ -1426,7 +1426,6 @@ static __init int vpif_probe(struct platform_device *pdev)
 	struct vpif_display_config *config;
 	int i, j = 0, k, q, m, err = 0;
 	struct i2c_adapter *i2c_adap;
-	struct vpif_config *config;
 	struct common_obj *common;
 	struct channel_obj *ch;
 	struct video_device *vfd;