diff --git a/[refs] b/[refs] index 68008ce6887b..66d8fb4f2976 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a644c072ea2a0ba9bd46430a4710cc3ac7cbdc21 +refs/heads/master: a40231a67c443c5913366a45e9fc3da20a798790 diff --git a/trunk/drivers/media/video/ir-kbd-i2c.c b/trunk/drivers/media/video/ir-kbd-i2c.c index 27ae8bbfb477..ece6e15e4c07 100644 --- a/trunk/drivers/media/video/ir-kbd-i2c.c +++ b/trunk/drivers/media/video/ir-kbd-i2c.c @@ -354,11 +354,9 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id) case 0x0b: case 0x47: case 0x71: - if (adap->id == I2C_HW_B_CX2388x || - adap->id == I2C_HW_B_CX2341X) { + if (adap->id == I2C_HW_B_CX2388x) { /* Handled by cx88-input */ - name = adap->id == I2C_HW_B_CX2341X ? "CX2341x remote" - : "CX2388x remote"; + name = "CX2388x remote"; ir_type = IR_TYPE_RC5; ir->get_key = get_key_haup_xvr; if (hauppauge == 1) {