diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-13 11:53:31 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-13 11:53:31 -0300 |
| commit | 4c691e7dabc47811013c7266fa5f32fe96687c36 (patch) | |
| tree | a6185d7724be9b53607ab988625fd75052b1a9b2 /linux/drivers/media/dvb/ttpci | |
| parent | 8201f56625ffdc9146ad8eb4525c1b50e6194f5a (diff) | |
| parent | 4198bf24c30e208e3c1a4d833e52ee2330bdb008 (diff) | |
| download | mediapointer-dvb-s2-4c691e7dabc47811013c7266fa5f32fe96687c36.tar.gz mediapointer-dvb-s2-4c691e7dabc47811013c7266fa5f32fe96687c36.tar.bz2 | |
merge: http://kernellabs.com/hg/~dheitmueller/em28xx-vbi3
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/dvb/ttpci')
| -rw-r--r-- | linux/drivers/media/dvb/ttpci/budget-ci.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux/drivers/media/dvb/ttpci/budget-ci.c b/linux/drivers/media/dvb/ttpci/budget-ci.c index 1b564eb79..8a68cc2f7 100644 --- a/linux/drivers/media/dvb/ttpci/budget-ci.c +++ b/linux/drivers/media/dvb/ttpci/budget-ci.c @@ -233,7 +233,7 @@ static int msp430_ir_init(struct budget_ci *budget_ci) case 0x1012: /* 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); + IR_TYPE_RC5, &ir_codes_hauppauge_new_table); if (rc5_device < 0) budget_ci->ir.rc5_device = 0x1f; @@ -245,7 +245,7 @@ static int msp430_ir_init(struct budget_ci *budget_ci) case 0x101a: /* for the Technotrend 1500 bundled remote */ ir_input_init(input_dev, &budget_ci->ir.state, - IR_TYPE_RC5, ir_codes_tt_1500); + IR_TYPE_RC5, &ir_codes_tt_1500_table); if (rc5_device < 0) budget_ci->ir.rc5_device = IR_DEVICE_ANY; @@ -255,7 +255,7 @@ static int msp430_ir_init(struct budget_ci *budget_ci) default: /* unknown remote */ ir_input_init(input_dev, &budget_ci->ir.state, - IR_TYPE_RC5, ir_codes_budget_ci_old); + IR_TYPE_RC5, &ir_codes_budget_ci_old_table); if (rc5_device < 0) budget_ci->ir.rc5_device = IR_DEVICE_ANY; |