[PATCH] V4L/DVB: (3151) I2C ID renamed to I2C_DRIVERID_INFRARED
authorMauro Carvalho Chehab <mchehab@brturbo.com.br>
Mon, 12 Dec 2005 08:37:31 +0000 (00:37 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 12 Dec 2005 16:57:45 +0000 (08:57 -0800)
I2C ID renamed to I2C_DRIVERID_INFRARED

Acked-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
drivers/media/video/ir-kbd-i2c.c
include/linux/i2c-id.h

index 52c54b15fd4a0b231236b767c5c7366c5f5b2876..740e543311af8c1930c8161332cc6a98395d8b59 100644 (file)
@@ -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,
index ef3b5632e63a2d835e46e09520326c96dbb974b3..006c81ef4d506013c5272e5544abf99fc3df5cc2 100644 (file)
 #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