diff options
Diffstat (limited to 'drivers/media/video/ivtv/ivtv-i2c.c')
-rw-r--r-- | drivers/media/video/ivtv/ivtv-i2c.c | 6 |
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 2ee03c2a1b58..a363e334a50e 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) | |||
193 | /* Our default information for ir-kbd-i2c.c to use */ | 193 | /* Our default information for ir-kbd-i2c.c to use */ |
194 | switch (hw) { | 194 | switch (hw) { |
195 | case IVTV_HW_I2C_IR_RX_AVER: | 195 | case IVTV_HW_I2C_IR_RX_AVER: |
196 | init_data->ir_codes = &ir_codes_avermedia_cardbus_table; | 196 | init_data->ir_codes = &IR_KEYTABLE(avermedia_cardbus); |
197 | init_data->internal_get_key_func = | 197 | init_data->internal_get_key_func = |
198 | IR_KBD_GET_KEY_AVERMEDIA_CARDBUS; | 198 | IR_KBD_GET_KEY_AVERMEDIA_CARDBUS; |
199 | init_data->type = IR_TYPE_OTHER; | 199 | 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) | |||
202 | case IVTV_HW_I2C_IR_RX_HAUP_EXT: | 202 | case IVTV_HW_I2C_IR_RX_HAUP_EXT: |
203 | case IVTV_HW_I2C_IR_RX_HAUP_INT: | 203 | case IVTV_HW_I2C_IR_RX_HAUP_INT: |
204 | /* Default to old black remote */ | 204 | /* Default to old black remote */ |
205 | init_data->ir_codes = &ir_codes_rc5_tv_table; | 205 | init_data->ir_codes = &IR_KEYTABLE(rc5_tv); |
206 | init_data->internal_get_key_func = IR_KBD_GET_KEY_HAUP; | 206 | init_data->internal_get_key_func = IR_KBD_GET_KEY_HAUP; |
207 | init_data->type = IR_TYPE_RC5; | 207 | init_data->type = IR_TYPE_RC5; |
208 | init_data->name = itv->card_name; | 208 | init_data->name = itv->card_name; |
209 | break; | 209 | break; |
210 | case IVTV_HW_Z8F0811_IR_RX_HAUP: | 210 | case IVTV_HW_Z8F0811_IR_RX_HAUP: |
211 | /* Default to grey remote */ | 211 | /* Default to grey remote */ |
212 | init_data->ir_codes = &ir_codes_hauppauge_new_table; | 212 | init_data->ir_codes = &IR_KEYTABLE(hauppauge_new); |
213 | init_data->internal_get_key_func = IR_KBD_GET_KEY_HAUP_XVR; | 213 | init_data->internal_get_key_func = IR_KBD_GET_KEY_HAUP_XVR; |
214 | init_data->type = IR_TYPE_RC5; | 214 | init_data->type = IR_TYPE_RC5; |
215 | init_data->name = itv->card_name; | 215 | init_data->name = itv->card_name; |