diff --git a/[refs] b/[refs]
index 300f2f960dbb..79955b0d3266 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f1bfaa0a2e97fbeaf6cc5a07212de0afa3a6232
+refs/heads/master: c69a4af6f06916936c8afd44a175e2bf1fbefaec
diff --git a/trunk/drivers/media/video/ir-kbd-i2c.c b/trunk/drivers/media/video/ir-kbd-i2c.c
index b173e409cd28..d2b20ad383a3 100644
--- a/trunk/drivers/media/video/ir-kbd-i2c.c
+++ b/trunk/drivers/media/video/ir-kbd-i2c.c
@@ -323,6 +323,12 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
 		rc_type     = RC_TYPE_OTHER;
 		ir_codes    = RC_MAP_AVERMEDIA_CARDBUS;
 		break;
+	case 0x71:
+		name        = "Hauppauge/Zilog Z8";
+		ir->get_key = get_key_haup_xvr;
+		rc_type     = RC_TYPE_RC5;
+		ir_codes    = hauppauge ? RC_MAP_HAUPPAUGE_NEW : RC_MAP_RC5_TV;
+		break;
 	}
 
 	/* Let the caller override settings */