diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-09-18 10:06:25 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-09-18 10:06:25 -0300 |
| commit | 28ad469a8bc0cf1b2fd9dc838a035ae7e7c06bf5 (patch) | |
| tree | d592bd4f23790839c6bd9000d03308a91ba7e9e5 /linux/drivers/media | |
| parent | e4d9c31546b277f4814be92885e4bf43a9991e47 (diff) | |
| parent | 38a33d4e9a3c0f5cddd6dd40a51785a55b8e69a9 (diff) | |
| download | mediapointer-dvb-s2-28ad469a8bc0cf1b2fd9dc838a035ae7e7c06bf5.tar.gz mediapointer-dvb-s2-28ad469a8bc0cf1b2fd9dc838a035ae7e7c06bf5.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/cx23885
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media')
| -rw-r--r-- | linux/drivers/media/dvb/ttpci/budget-ci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/dvb/ttpci/budget-ci.c b/linux/drivers/media/dvb/ttpci/budget-ci.c index a0e24c779..3ccca5d90 100644 --- a/linux/drivers/media/dvb/ttpci/budget-ci.c +++ b/linux/drivers/media/dvb/ttpci/budget-ci.c @@ -224,7 +224,6 @@ static int msp430_ir_init(struct budget_ci *budget_ci) case 0x100f: case 0x1011: case 0x1012: - case 0x1017: /* The hauppauge keymap is a superset of these remotes */ ir_input_init(input_dev, &budget_ci->ir.state, IR_TYPE_RC5, ir_codes_hauppauge_new); @@ -235,6 +234,7 @@ static int msp430_ir_init(struct budget_ci *budget_ci) budget_ci->ir.rc5_device = rc5_device; break; case 0x1010: + case 0x1017: /* for the Technotrend 1500 bundled remote */ ir_input_init(input_dev, &budget_ci->ir.state, IR_TYPE_RC5, ir_codes_tt_1500); |