---

yaml --- r: 226269 b: refs/heads/master c: 29e3ec1 h: refs/heads/master i: 226267: f6f87eb v: v3
git-mirror · Dec 29, 2010 · c58829d · c58829d
1 parent 650ed50
commit c58829d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ca86674b8a93ea11c4bb6f4dd0113b1adf1fa841
+refs/heads/master: 29e3ec19d5c88d534ced219d3962d67243e4d310
diff --git a/trunk/drivers/media/video/cx231xx/cx231xx-cards.c b/trunk/drivers/media/video/cx231xx/cx231xx-cards.c
@@ -412,7 +412,7 @@ struct cx231xx_board cx231xx_boards[] = {
 		.tuner_i2c_master = 2,
 		.demod_i2c_master = 1,
 		.ir_i2c_master = 2,
-		.rc_map = RC_MAP_PIXELVIEW_NEW,
+		.rc_map_name = RC_MAP_PIXELVIEW_NEW,
 		.has_dvb = 1,
 		.demod_addr = 0x10,
 		.norm = V4L2_STD_PAL_M,

diff --git a/trunk/drivers/media/video/cx231xx/cx231xx-input.c b/trunk/drivers/media/video/cx231xx/cx231xx-input.c
@@ -57,7 +57,7 @@ int cx231xx_ir_init(struct cx231xx *dev)
 	dev_dbg(&dev->udev->dev, "%s\n", __func__);
 
 	/* Only initialize if a rc keycode map is defined */
-	if (!cx231xx_boards[dev->model].rc_map)
+	if (!cx231xx_boards[dev->model].rc_map_name)
 		return -ENODEV;
 
 	request_module("ir-kbd-i2c");
@@ -80,7 +80,7 @@ int cx231xx_ir_init(struct cx231xx *dev)
 	 * an i2c device.
 	 */
 	dev->init_data.get_key = get_key_isdbt;
-	dev->init_data.ir_codes = cx231xx_boards[dev->model].rc_map;
+	dev->init_data.ir_codes = cx231xx_boards[dev->model].rc_map_name;
 	/* The i2c micro-controller only outputs the cmd part of NEC protocol */
 	dev->init_data.rc_dev->scanmask = 0xff;
 	dev->init_data.rc_dev->driver_name = "cx231xx";

diff --git a/trunk/drivers/media/video/cx231xx/cx231xx.h b/trunk/drivers/media/video/cx231xx/cx231xx.h
@@ -349,7 +349,7 @@ struct cx231xx_board {
 	u8 ir_i2c_master;
 
 	/* for devices with I2C chips for IR */
-	char *rc_map;
+	char *rc_map_name;
 
 	unsigned int max_range_640_480:1;
 	unsigned int has_dvb:1;