summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/ir-kbd-i2c.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2011-01-24 12:18:48 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-03-22 19:24:16 -0300
commitaf86ce79f020a31e4a30661e41471d31face9985 (patch)
tree69d247738a06aa4c0bf176f1e1bed9a79cd11790 /drivers/media/video/ir-kbd-i2c.c
parent15195d3a83b59f0ca3bed52cbe5524042ce13fd6 (diff)
downloadop-kernel-dev-af86ce79f020a31e4a30661e41471d31face9985.zip
op-kernel-dev-af86ce79f020a31e4a30661e41471d31face9985.tar.gz
[media] remove the old RC_MAP_HAUPPAUGE_NEW RC map
The rc-hauppauge-new map is a messy thing, as it bundles 3 different remote controllers as if they were just one, discarding the address byte. Also, some key maps are wrong. With the conversion to the new rc-core, it is likely that most of the devices won't be working properly, as the i2c driver and the raw decoders are now providing 16 bits for the remote, instead of just 8. delete mode 100644 drivers/media/rc/keymaps/rc-hauppauge-new.c Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Jarod Wilson <jarod@redhat.com>
Diffstat (limited to 'drivers/media/video/ir-kbd-i2c.c')
-rw-r--r--drivers/media/video/ir-kbd-i2c.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index a221ad6..be7064f 100644
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -313,7 +313,7 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
ir->get_key = get_key_haup;
rc_type = RC_TYPE_RC5;
if (hauppauge == 1) {
- ir_codes = RC_MAP_HAUPPAUGE_NEW;
+ ir_codes = RC_MAP_HAUPPAUGE;
} else {
ir_codes = RC_MAP_RC5_TV;
}
@@ -340,7 +340,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 = hauppauge ? RC_MAP_HAUPPAUGE : RC_MAP_RC5_TV;
break;
}
OpenPOWER on IntegriCloud