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>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/media/video/cx23885/cx23885-input.c b/drivers/media/video/cx23885/cx23885-input.c
index cef36f6b93e3..8d306d8bb61c 100644
--- a/drivers/media/video/cx23885/cx23885-input.c
+++ b/drivers/media/video/cx23885/cx23885-input.c
@@ -340,7 +340,7 @@ int cx23885_input_init(struct cx23885_dev *dev)
 {
         struct card_ir *ir;
         struct input_dev *input_dev;
-        struct ir_scancode_table *ir_codes = NULL;
+        char *ir_codes = NULL;
         int ir_type, ir_addr, ir_start;
         int ret;
 
@@ -355,7 +355,7 @@ int cx23885_input_init(struct cx23885_dev *dev)
         case CX23885_BOARD_HAUPPAUGE_HVR1850:
         case CX23885_BOARD_HAUPPAUGE_HVR1290:
                 /* Parameters for the grey Hauppauge remote for the HVR-1850 */
-                ir_codes = &IR_KEYTABLE(hauppauge_new);
+                ir_codes = RC_MAP_HAUPPAUGE_NEW;
                 ir_type = IR_TYPE_RC5;
                 ir_addr = 0x1e; /* RC-5 system bits emitted by the remote */
                 ir_start = RC5_START_BITS_NORMAL; /* A basic RC-5 remote */
@@ -400,7 +400,7 @@ int cx23885_input_init(struct cx23885_dev *dev)
         dev->ir_input = ir;
         cx23885_input_ir_start(dev);
 
-        ret = __ir_input_register(ir->dev, ir_codes, NULL, MODULE_NAME);
+        ret = ir_input_register(ir->dev, ir_codes, NULL, MODULE_NAME);
         if (ret)
                 goto err_out_stop;