diff --git a/[refs] b/[refs]
index dc194cef45b9..374bcb4ec27d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4e5f1130070ebfdde1b0ea6277e881404e5f34ce
+refs/heads/master: b781e6be79a394cd6980e9cd8fd5c25822d152b6
diff --git a/trunk/drivers/media/i2c/sony-btf-mpx.c b/trunk/drivers/media/i2c/sony-btf-mpx.c
index bc73e8ff0471..38cbea98764c 100644
--- a/trunk/drivers/media/i2c/sony-btf-mpx.c
+++ b/trunk/drivers/media/i2c/sony-btf-mpx.c
@@ -311,7 +311,7 @@ static int sony_btf_mpx_g_tuner(struct v4l2_subdev *sd, struct v4l2_tuner *vt)
 	return 0;
 }
 
-static int sony_btf_mpx_s_tuner(struct v4l2_subdev *sd, struct v4l2_tuner *vt)
+static int sony_btf_mpx_s_tuner(struct v4l2_subdev *sd, const struct v4l2_tuner *vt)
 {
 	struct sony_btf_mpx *t = to_state(sd);