Merge branch 'viafb-next' of git://github.com/schandinat/linux-2.6

[pandora-kernel.git] / drivers / media / video / ir-kbd-i2c.c

diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index a221ad6..3ab875d 100644 (file)
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -55,10 +55,6 @@
 static int debug;
 module_param(debug, int, 0644);    /* debug level (0,1,2) */
 
-static int hauppauge;
-module_param(hauppauge, int, 0644);    /* Choose Hauppauge remote */
-MODULE_PARM_DESC(hauppauge, "Specify Hauppauge remote: 0=black, 1=grey (defaults to 0)");
-
 
 #define MODULE_NAME "ir-kbd-i2c"
 #define dprintk(level, fmt, arg...)    if (debug >= level) \
@@ -105,10 +101,6 @@ static int get_key_haup_common(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw,
                /* invalid key press */
                return 0;
 
-       if (dev!=0x1e && dev!=0x1f)
-               /* not a hauppauge remote */
-               return 0;
-
        if (!range)
                code += 64;
 
@@ -116,7 +108,7 @@ static int get_key_haup_common(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw,
                start, range, toggle, dev, code);
 
        /* return key */
-       *ir_key = code;
+       *ir_key = (dev << 8) | code;
        *ir_raw = ircode;
        return 1;
 }
@@ -312,11 +304,7 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
                name        = "Hauppauge";
                ir->get_key = get_key_haup;
                rc_type     = RC_TYPE_RC5;
-               if (hauppauge == 1) {
-                       ir_codes    = RC_MAP_HAUPPAUGE_NEW;
-               } else {
-                       ir_codes    = RC_MAP_RC5_TV;
-               }
+               ir_codes    = RC_MAP_HAUPPAUGE;
                break;
        case 0x30:
                name        = "KNC One";
@@ -340,7 +328,7 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
                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;
+               ir_codes    = RC_MAP_HAUPPAUGE;
                break;
        }