diff --git a/[refs] b/[refs]
index 5463cbfd6657..1fdb7e5ccf84 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0f2ce9834246519e483e89dbc7225fe1fcbd30a8
+refs/heads/master: 1641002bf56c1da265f2c49ea1c29baba997e63b
diff --git a/trunk/drivers/media/video/tuner-core.c b/trunk/drivers/media/video/tuner-core.c
index 8e406b168d71..ba538f6fbcc3 100644
--- a/trunk/drivers/media/video/tuner-core.c
+++ b/trunk/drivers/media/video/tuner-core.c
@@ -297,6 +297,12 @@ static void tuner_i2c_address_check(struct tuner *t)
 	    ((t->i2c->addr < 0x64) || (t->i2c->addr > 0x6f)))
 		return;
 
+	/* We already know that the XC5000 can only be located at
+	 * i2c address 0x61, 0x62, 0x63 or 0x64 */
+	if ((t->type == TUNER_XC5000) &&
+	    ((t->i2c->addr <= 0x64)) && (t->i2c->addr >= 0x61))
+		return;
+
 	tuner_warn("====================== WARNING! ======================\n");
 	tuner_warn("Support for tuners in i2c address range 0x64 thru 0x6f\n");
 	tuner_warn("will soon be dropped. This message indicates that your\n");