diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-04-02 19:01:00 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-05-19 11:56:50 -0400 |
commit | 02858eedcb78a664215b918d98cdb753ce432ce6 (patch) | |
tree | dd212b7b2e63cd846a1c9cf0d9b751514648b130 /drivers/media/dvb/dm1105 | |
parent | b2245ba1644eb1eba400fd04c6e7bb3ab2d4a8fa (diff) |
V4L/DVB: ir-core: Make use of the new IR keymap modules
Instead of using the ugly keymap sequences, use the new rc-*.ko keymap
files. For now, it is still needed to have one keymap loaded, for the
RC code to work. Later patches will remove this depenency.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/dm1105')
-rw-r--r-- | drivers/media/dvb/dm1105/dm1105.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/dvb/dm1105/dm1105.c b/drivers/media/dvb/dm1105/dm1105.c index 416c29bf78d9..9d389bdaca41 100644 --- a/drivers/media/dvb/dm1105/dm1105.c +++ b/drivers/media/dvb/dm1105/dm1105.c | |||
@@ -596,7 +596,7 @@ static irqreturn_t dm1105_irq(int irq, void *dev_id) | |||
596 | int __devinit dm1105_ir_init(struct dm1105_dev *dm1105) | 596 | int __devinit dm1105_ir_init(struct dm1105_dev *dm1105) |
597 | { | 597 | { |
598 | struct input_dev *input_dev; | 598 | struct input_dev *input_dev; |
599 | struct ir_scancode_table *ir_codes = &IR_KEYTABLE(dm1105_nec); | 599 | char *ir_codes = NULL; |
600 | u64 ir_type = IR_TYPE_OTHER; | 600 | u64 ir_type = IR_TYPE_OTHER; |
601 | int err = -ENOMEM; | 601 | int err = -ENOMEM; |
602 | 602 | ||
@@ -630,7 +630,7 @@ int __devinit dm1105_ir_init(struct dm1105_dev *dm1105) | |||
630 | 630 | ||
631 | INIT_WORK(&dm1105->ir.work, dm1105_emit_key); | 631 | INIT_WORK(&dm1105->ir.work, dm1105_emit_key); |
632 | 632 | ||
633 | err = __ir_input_register(input_dev, ir_codes, NULL, MODULE_NAME); | 633 | err = ir_input_register(input_dev, ir_codes, NULL, MODULE_NAME); |
634 | 634 | ||
635 | return err; | 635 | return err; |
636 | } | 636 | } |