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/ivtv/ivtv-i2c.c b/drivers/media/video/ivtv/ivtv-i2c.c
index a363e334a50e..a5b92d109c6c 100644
--- a/drivers/media/video/ivtv/ivtv-i2c.c
+++ b/drivers/media/video/ivtv/ivtv-i2c.c
@@ -193,7 +193,7 @@ static int ivtv_i2c_new_ir(struct ivtv *itv, u32 hw, const char *type, u8 addr)
         /* Our default information for ir-kbd-i2c.c to use */
         switch (hw) {
         case IVTV_HW_I2C_IR_RX_AVER:
-                init_data->ir_codes = &IR_KEYTABLE(avermedia_cardbus);
+                init_data->ir_codes = RC_MAP_AVERMEDIA_CARDBUS;
                 init_data->internal_get_key_func =
                                         IR_KBD_GET_KEY_AVERMEDIA_CARDBUS;
                 init_data->type = IR_TYPE_OTHER;
@@ -202,14 +202,14 @@ static int ivtv_i2c_new_ir(struct ivtv *itv, u32 hw, const char *type, u8 addr)
         case IVTV_HW_I2C_IR_RX_HAUP_EXT:
         case IVTV_HW_I2C_IR_RX_HAUP_INT:
                 /* Default to old black remote */
-                init_data->ir_codes = &IR_KEYTABLE(rc5_tv);
+                init_data->ir_codes = RC_MAP_RC5_TV;
                 init_data->internal_get_key_func = IR_KBD_GET_KEY_HAUP;
                 init_data->type = IR_TYPE_RC5;
                 init_data->name = itv->card_name;
                 break;
         case IVTV_HW_Z8F0811_IR_RX_HAUP:
                 /* Default to grey remote */
-                init_data->ir_codes = &IR_KEYTABLE(hauppauge_new);
+                init_data->ir_codes = RC_MAP_HAUPPAUGE_NEW;
                 init_data->internal_get_key_func = IR_KBD_GET_KEY_HAUP_XVR;
                 init_data->type = IR_TYPE_RC5;
                 init_data->name = itv->card_name;