diff options
Diffstat (limited to 'drivers/media/pci/ivtv/ivtv-i2c.c')
-rw-r--r-- | drivers/media/pci/ivtv/ivtv-i2c.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/pci/ivtv/ivtv-i2c.c b/drivers/media/pci/ivtv/ivtv-i2c.c index d47f41a0ef66..46e262becb67 100644 --- a/drivers/media/pci/ivtv/ivtv-i2c.c +++ b/drivers/media/pci/ivtv/ivtv-i2c.c | |||
@@ -200,21 +200,21 @@ static int ivtv_i2c_new_ir(struct ivtv *itv, u32 hw, const char *type, u8 addr) | |||
200 | init_data->ir_codes = RC_MAP_AVERMEDIA_CARDBUS; | 200 | init_data->ir_codes = RC_MAP_AVERMEDIA_CARDBUS; |
201 | init_data->internal_get_key_func = | 201 | init_data->internal_get_key_func = |
202 | IR_KBD_GET_KEY_AVERMEDIA_CARDBUS; | 202 | IR_KBD_GET_KEY_AVERMEDIA_CARDBUS; |
203 | init_data->type = RC_TYPE_OTHER; | 203 | init_data->type = RC_BIT_OTHER; |
204 | init_data->name = "AVerMedia AVerTV card"; | 204 | init_data->name = "AVerMedia AVerTV card"; |
205 | break; | 205 | break; |
206 | case IVTV_HW_I2C_IR_RX_HAUP_EXT: | 206 | case IVTV_HW_I2C_IR_RX_HAUP_EXT: |
207 | case IVTV_HW_I2C_IR_RX_HAUP_INT: | 207 | case IVTV_HW_I2C_IR_RX_HAUP_INT: |
208 | init_data->ir_codes = RC_MAP_HAUPPAUGE; | 208 | init_data->ir_codes = RC_MAP_HAUPPAUGE; |
209 | init_data->internal_get_key_func = IR_KBD_GET_KEY_HAUP; | 209 | init_data->internal_get_key_func = IR_KBD_GET_KEY_HAUP; |
210 | init_data->type = RC_TYPE_RC5; | 210 | init_data->type = RC_BIT_RC5; |
211 | init_data->name = itv->card_name; | 211 | init_data->name = itv->card_name; |
212 | break; | 212 | break; |
213 | case IVTV_HW_Z8F0811_IR_RX_HAUP: | 213 | case IVTV_HW_Z8F0811_IR_RX_HAUP: |
214 | /* Default to grey remote */ | 214 | /* Default to grey remote */ |
215 | init_data->ir_codes = RC_MAP_HAUPPAUGE; | 215 | init_data->ir_codes = RC_MAP_HAUPPAUGE; |
216 | init_data->internal_get_key_func = IR_KBD_GET_KEY_HAUP_XVR; | 216 | init_data->internal_get_key_func = IR_KBD_GET_KEY_HAUP_XVR; |
217 | init_data->type = RC_TYPE_RC5; | 217 | init_data->type = RC_BIT_RC5; |
218 | init_data->name = itv->card_name; | 218 | init_data->name = itv->card_name; |
219 | break; | 219 | break; |
220 | case IVTV_HW_I2C_IR_RX_ADAPTEC: | 220 | case IVTV_HW_I2C_IR_RX_ADAPTEC: |
@@ -222,7 +222,7 @@ static int ivtv_i2c_new_ir(struct ivtv *itv, u32 hw, const char *type, u8 addr) | |||
222 | init_data->name = itv->card_name; | 222 | init_data->name = itv->card_name; |
223 | /* FIXME: The protocol and RC_MAP needs to be corrected */ | 223 | /* FIXME: The protocol and RC_MAP needs to be corrected */ |
224 | init_data->ir_codes = RC_MAP_EMPTY; | 224 | init_data->ir_codes = RC_MAP_EMPTY; |
225 | init_data->type = RC_TYPE_UNKNOWN; | 225 | init_data->type = RC_BIT_UNKNOWN; |
226 | break; | 226 | break; |
227 | } | 227 | } |
228 | 228 | ||