diff --git a/[refs] b/[refs]
index d33fe3bb79b6..dea4efd369f8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a55db8cd7f8a107f3abcb4c803b1873b2be63663
+refs/heads/master: 864a6b813ab6cb69f3552553899ae443329ecfa9
diff --git a/trunk/drivers/media/video/tuner-core.c b/trunk/drivers/media/video/tuner-core.c
index 59e67c925758..355f9810facf 100644
--- a/trunk/drivers/media/video/tuner-core.c
+++ b/trunk/drivers/media/video/tuner-core.c
@@ -1138,11 +1138,11 @@ static int tuner_probe(struct i2c_client *client)
 
 	/* Sets a default mode */
 	if (t->mode_mask & T_ANALOG_TV) {
-		t->mode = T_ANALOG_TV;
+		t->mode = V4L2_TUNER_ANALOG_TV;
 	} else  if (t->mode_mask & T_RADIO) {
-		t->mode = T_RADIO;
+		t->mode = V4L2_TUNER_RADIO;
 	} else {
-		t->mode = T_DIGITAL_TV;
+		t->mode = V4L2_TUNER_DIGITAL_TV;
 	}
 	set_type(client, t->type, t->mode_mask, t->config, t->tuner_callback);
 	list_add_tail(&t->list, &tuner_list);