diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-01-12 23:09:13 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-01-12 23:09:13 -0200 |
| commit | a7d752ebb538194f5c37a91e5c53cd6fd4d2106f (patch) | |
| tree | 676cd2d7cb785faa39ae32067d69f8836d048a13 /linux/drivers/media/dvb/ttpci/budget-ci.c | |
| parent | 844bc59031b6cff1a3cd1f5ba1f0e64a81cac924 (diff) | |
| parent | 54fe675f8693b0a197dcb2fe5a536f52e06a35b1 (diff) | |
| download | mediapointer-dvb-s2-a7d752ebb538194f5c37a91e5c53cd6fd4d2106f.tar.gz mediapointer-dvb-s2-a7d752ebb538194f5c37a91e5c53cd6fd4d2106f.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/dvb/ttpci/budget-ci.c')
| -rw-r--r-- | linux/drivers/media/dvb/ttpci/budget-ci.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/linux/drivers/media/dvb/ttpci/budget-ci.c b/linux/drivers/media/dvb/ttpci/budget-ci.c index 9ebab71c8..b100cb485 100644 --- a/linux/drivers/media/dvb/ttpci/budget-ci.c +++ b/linux/drivers/media/dvb/ttpci/budget-ci.c @@ -229,7 +229,6 @@ static int msp430_ir_init(struct budget_ci *budget_ci) switch (budget_ci->budget.dev->pci->subsystem_device) { case 0x100c: case 0x100f: - case 0x1010: case 0x1011: case 0x1012: case 0x1017: @@ -242,6 +241,16 @@ static int msp430_ir_init(struct budget_ci *budget_ci) else budget_ci->ir.rc5_device = rc5_device; break; + case 0x1010: + /* for the Technotrend 1500 bundled remote */ + ir_input_init(input_dev, &budget_ci->ir.state, + IR_TYPE_RC5, ir_codes_tt_1500); + + if (rc5_device < 0) + budget_ci->ir.rc5_device = IR_DEVICE_ANY; + else + budget_ci->ir.rc5_device = rc5_device; + break; default: /* unknown remote */ ir_input_init(input_dev, &budget_ci->ir.state, |