aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/ir-kbd-i2c.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2010-09-22 23:51:44 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-10-20 23:06:07 -0400
commit44243fc2ef99948bc9b046901880885616dd5e89 (patch)
tree48c84ea222cbb44db21842dbed24727e2cec6931 /drivers/media/video/ir-kbd-i2c.c
parentc0c46826274a4da5d9e312d7cfd4ca0806c0a358 (diff)
V4L/DVB: Remove the usage of I2C_HW_B_CX2388x on ir-kbd-i2c.c
Move the cx88 specific initialization for Hauppauge XVR remotes into cx88-input, removing the need for test it inside ir-kbd-i2c. The reference at cx88 for this symbol, at: drivers/media/video/cx88/cx88-i2c.c: core->i2c_adap.id = I2C_HW_B_CX2388x; drivers/media/video/cx88/cx88-vp3054-i2c.c: vp3054_i2c->adap.id = I2C_HW_B_CX2388x; Can't be removed yet, since lirc-i2c still uses it. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/ir-kbd-i2c.c')
-rw-r--r--drivers/media/video/ir-kbd-i2c.c19
1 files changed, 0 insertions, 19 deletions
diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index 02fbd08112c9..91b2c88d4d72 100644
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -325,25 +325,6 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
325 ir_type = IR_TYPE_RC5; 325 ir_type = IR_TYPE_RC5;
326 ir_codes = RC_MAP_FUSIONHDTV_MCE; 326 ir_codes = RC_MAP_FUSIONHDTV_MCE;
327 break; 327 break;
328 case 0x0b:
329 case 0x47:
330 case 0x71:
331 if (adap->id == I2C_HW_B_CX2388x) {
332 /* Handled by cx88-input */
333 name = "CX2388x remote";
334 ir_type = IR_TYPE_RC5;
335 ir->get_key = get_key_haup_xvr;
336 if (hauppauge == 1) {
337 ir_codes = RC_MAP_HAUPPAUGE_NEW;
338 } else {
339 ir_codes = RC_MAP_RC5_TV;
340 }
341 } else {
342 /* Handled by saa7134-input */
343 name = "SAA713x remote";
344 ir_type = IR_TYPE_OTHER;
345 }
346 break;
347 case 0x40: 328 case 0x40:
348 name = "AVerMedia Cardbus remote"; 329 name = "AVerMedia Cardbus remote";
349 ir->get_key = get_key_avermedia_cardbus; 330 ir->get_key = get_key_avermedia_cardbus;