OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a644c07
)
V4L/DVB: ir-kbd-i2c: remove obsolete I2C_HW_B_CX2341X test
author
Hans Verkuil
<hverkuil@xs4all.nl>
Wed, 15 Sep 2010 19:16:20 +0000
(16:16 -0300)
committer
Mauro Carvalho Chehab
<mchehab@redhat.com>
Thu, 21 Oct 2010 03:06:05 +0000
(
01:06
-0200)
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/ir-kbd-i2c.c
patch
|
blob
|
history
diff --git
a/drivers/media/video/ir-kbd-i2c.c
b/drivers/media/video/ir-kbd-i2c.c
index
27ae8bb
..
ece6e15
100644
(file)
--- a/
drivers/media/video/ir-kbd-i2c.c
+++ b/
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) {