From 86dc4086b7a1ded4faede002e0072c9800c914b8 Mon Sep 17 00:00:00 2001
From: "J.O. Aho" <trizt@iname.com>
Date: Mon, 23 Jan 2006 09:34:06 -0200
Subject: [PATCH] --- yaml --- r: 21568 b: refs/heads/master c:
 bf47e4e43e4dcf88fef61b1b4139ce2da20e1f73 h: refs/heads/master v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/media/video/ir-kbd-i2c.c | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d5530b335109..6ebe91c8bc25 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f74a6b395a6dea5028a1604e721dfb2b5c18fc86
+refs/heads/master: bf47e4e43e4dcf88fef61b1b4139ce2da20e1f73
diff --git a/trunk/drivers/media/video/ir-kbd-i2c.c b/trunk/drivers/media/video/ir-kbd-i2c.c
index 58b0e6982822..3963481b3130 100644
--- a/trunk/drivers/media/video/ir-kbd-i2c.c
+++ b/trunk/drivers/media/video/ir-kbd-i2c.c
@@ -89,6 +89,11 @@ static IR_KEYTAB_TYPE ir_codes_pv951[IR_KEYTAB_SIZE] = {
 static int debug;
 module_param(debug, int, 0644);    /* debug level (0,1,2) */
 
+static int hauppauge = 0;
+module_param(hauppauge, int, 0644);    /* Choose Hauppauge remote */
+MODULE_PARM_DESC(hauppauge, "Specify Hauppauge remote: 0=black, 1=grey (defaults to 0)");
+
+
 #define DEVNAME "ir-kbd-i2c"
 #define dprintk(level, fmt, arg...)	if (debug >= level) \
 	printk(KERN_DEBUG DEVNAME ": " fmt , ## arg)
@@ -336,7 +341,11 @@ static int ir_attach(struct i2c_adapter *adap, int addr,
 		name        = "Hauppauge";
 		ir->get_key = get_key_haup;
 		ir_type     = IR_TYPE_RC5;
-		ir_codes    = ir_codes_rc5_tv;
+		if (hauppauge == 1) {
+			ir_codes    = ir_codes_rc5_tv_grey;
+		} else {
+			ir_codes    = ir_codes_rc5_tv;
+		}
 		break;
 	case 0x30:
 		name        = "KNC One";