diff --git a/[refs] b/[refs]
index 0c88de03540c..12c90a4aad68 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e276f03b4f29fcc54d8e658d5de8dd953e4aef1e
+refs/heads/master: cc91de5fad155fdfb40856ac65f29f080b9b42ab
diff --git a/trunk/drivers/media/platform/davinci/vpbe.c b/trunk/drivers/media/platform/davinci/vpbe.c
index dd670cdb2c2a..fe2b9ce0bce8 100644
--- a/trunk/drivers/media/platform/davinci/vpbe.c
+++ b/trunk/drivers/media/platform/davinci/vpbe.c
@@ -584,7 +584,6 @@ static int vpbe_initialize(struct device *dev, struct vpbe_device *vpbe_dev)
 	struct v4l2_subdev **enc_subdev;
 	struct osd_state *osd_device;
 	struct i2c_adapter *i2c_adap;
-	int output_index;
 	int num_encoders;
 	int ret = 0;
 	int err;
@@ -731,7 +730,6 @@ static int vpbe_initialize(struct device *dev, struct vpbe_device *vpbe_dev)
 	/* set the current encoder and output to that of venc by default */
 	vpbe_dev->current_sd_index = 0;
 	vpbe_dev->current_out_index = 0;
-	output_index = 0;
 
 	mutex_unlock(&vpbe_dev->lock);