diff --git a/[refs] b/[refs]
index 89f7deb15e75..8a02fba29763 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 11e0f1a89750d0139eecbb41b89d6b2d33a718b6
+refs/heads/master: efba4bc12c7e81b8ece677eed5b8c8bc754802dc
diff --git a/trunk/drivers/media/video/cx25840/cx25840-core.c b/trunk/drivers/media/video/cx25840/cx25840-core.c
index af1eea03dd11..dfb198d0415b 100644
--- a/trunk/drivers/media/video/cx25840/cx25840-core.c
+++ b/trunk/drivers/media/video/cx25840/cx25840-core.c
@@ -1560,7 +1560,6 @@ static int cx25840_s_audio_routing(struct v4l2_subdev *sd,
 
 static int cx25840_s_frequency(struct v4l2_subdev *sd, struct v4l2_frequency *freq)
 {
-	struct cx25840_state *state = to_state(sd);
 	struct i2c_client *client = v4l2_get_subdevdata(sd);
 
 	input_change(client);