aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/ivtv
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2010-11-17 12:20:52 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-12-29 05:16:50 -0500
commit52b661449aecc47e652a164c0d8078b31e10aca0 (patch)
tree42af14cf5b6df82b841ec4bf38f22da54fc4439b /drivers/media/video/ivtv
parent29e3ec19d5c88d534ced219d3962d67243e4d310 (diff)
[media] rc: Rename remote controller type to rc_type instead of ir_type
for i in `find drivers/staging -type f -name *.[ch]` `find include/media -type f -name *.[ch]` `find drivers/media -type f -name *.[ch]`; do sed s,IR_TYPE,RC_TYPE,g <$i >a && mv a $i; done for i in `find drivers/staging -type f -name *.[ch]` `find include/media -type f -name *.[ch]` `find drivers/media -type f -name *.[ch]`; do sed s,ir_type,rc_type,g <$i >a && mv a $i; done Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/ivtv')
-rw-r--r--drivers/media/video/ivtv/ivtv-i2c.c6
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 665191c9b407..68170924448c 100644
--- a/drivers/media/video/ivtv/ivtv-i2c.c
+++ b/drivers/media/video/ivtv/ivtv-i2c.c
@@ -172,7 +172,7 @@ static int ivtv_i2c_new_ir(struct ivtv *itv, u32 hw, const char *type, u8 addr)
172 init_data->ir_codes = RC_MAP_AVERMEDIA_CARDBUS; 172 init_data->ir_codes = RC_MAP_AVERMEDIA_CARDBUS;
173 init_data->internal_get_key_func = 173 init_data->internal_get_key_func =
174 IR_KBD_GET_KEY_AVERMEDIA_CARDBUS; 174 IR_KBD_GET_KEY_AVERMEDIA_CARDBUS;
175 init_data->type = IR_TYPE_OTHER; 175 init_data->type = RC_TYPE_OTHER;
176 init_data->name = "AVerMedia AVerTV card"; 176 init_data->name = "AVerMedia AVerTV card";
177 break; 177 break;
178 case IVTV_HW_I2C_IR_RX_HAUP_EXT: 178 case IVTV_HW_I2C_IR_RX_HAUP_EXT:
@@ -180,14 +180,14 @@ static int ivtv_i2c_new_ir(struct ivtv *itv, u32 hw, const char *type, u8 addr)
180 /* Default to old black remote */ 180 /* Default to old black remote */
181 init_data->ir_codes = RC_MAP_RC5_TV; 181 init_data->ir_codes = RC_MAP_RC5_TV;
182 init_data->internal_get_key_func = IR_KBD_GET_KEY_HAUP; 182 init_data->internal_get_key_func = IR_KBD_GET_KEY_HAUP;
183 init_data->type = IR_TYPE_RC5; 183 init_data->type = RC_TYPE_RC5;
184 init_data->name = itv->card_name; 184 init_data->name = itv->card_name;
185 break; 185 break;
186 case IVTV_HW_Z8F0811_IR_RX_HAUP: 186 case IVTV_HW_Z8F0811_IR_RX_HAUP:
187 /* Default to grey remote */ 187 /* Default to grey remote */
188 init_data->ir_codes = RC_MAP_HAUPPAUGE_NEW; 188 init_data->ir_codes = RC_MAP_HAUPPAUGE_NEW;
189 init_data->internal_get_key_func = IR_KBD_GET_KEY_HAUP_XVR; 189 init_data->internal_get_key_func = IR_KBD_GET_KEY_HAUP_XVR;
190 init_data->type = IR_TYPE_RC5; 190 init_data->type = RC_TYPE_RC5;
191 init_data->name = itv->card_name; 191 init_data->name = itv->card_name;
192 break; 192 break;
193 } 193 }