Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd815408 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab Committed by Linus Torvalds
Browse files

[PATCH] V4L/DVB: (3151) I2C ID renamed to I2C_DRIVERID_INFRARED 



I2C ID renamed to I2C_DRIVERID_INFRARED

Acked-off-by: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 3639c861

drivers/media/video/ir-kbd-i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ static int ir_probe(struct i2c_adapter *adap); 


static struct i2c_driver driver = {

	.name           = "ir remote kbd driver",

	.id             = I2C_DRIVERID_I2C_IR,

	.id             = I2C_DRIVERID_INFRARED,

	.flags          = I2C_DF_NOTIFY,

	.attach_adapter = ir_probe,

	.detach_client  = ir_detach,

include/linux/i2c-id.h

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ 
#define I2C_DRIVERID_SAA7127	72	/* saa7124 video encoder	*/

#define I2C_DRIVERID_SAA711X	73	/* saa711x video encoders	*/

#define I2C_DRIVERID_AKITAIOEXP	74	/* IO Expander on Sharp SL-C1000 */

#define I2C_DRIVERID_I2C_IR	75	/* I2C InfraRed on Video boards */

#define I2C_DRIVERID_INFRARED	75	/* I2C InfraRed on Video boards */



#define I2C_DRIVERID_EXP0	0xF0	/* experimental use id's	*/

#define I2C_DRIVERID_EXP1	0xF1