V4L/DVB: ir-core: Make use of the new IR keymap modules

[net-next-2.6.git] / drivers / media / dvb / dm1105 / dm1105.c

diff --git a/drivers/media/dvb/dm1105/dm1105.c b/drivers/media/dvb/dm1105/dm1105.c
index b6d46961a99e8726954f4adb2381e59fa05d60a3..9d389bdaca411cac7cb804a173c46e219c295e46 100644 (file)
--- a/drivers/media/dvb/dm1105/dm1105.c
+++ b/drivers/media/dvb/dm1105/dm1105.c
@@ -46,6 +46,8 @@
 #include "z0194a.h"
 #include "ds3000.h"
 
+#define MODULE_NAME "dm1105"
+
 #define UNSET (-1U)
 
 #define DM1105_BOARD_NOAUTO            UNSET
@@ -594,7 +596,7 @@ static irqreturn_t dm1105_irq(int irq, void *dev_id)
 int __devinit dm1105_ir_init(struct dm1105_dev *dm1105)
 {
        struct input_dev *input_dev;
-       struct ir_scancode_table *ir_codes = &ir_codes_dm1105_nec_table;
+       char *ir_codes = NULL;
        u64 ir_type = IR_TYPE_OTHER;
        int err = -ENOMEM;
 
@@ -628,7 +630,7 @@ int __devinit dm1105_ir_init(struct dm1105_dev *dm1105)
 
        INIT_WORK(&dm1105->ir.work, dm1105_emit_key);
 
-       err = ir_input_register(input_dev, ir_codes, NULL);
+       err = ir_input_register(input_dev, ir_codes, NULL, MODULE_NAME);
 
        return err;
 }