From b16dca94991c9ed5c2fc4edfc625887177221f89 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Mon, 12 Dec 2005 00:37:31 -0800 Subject: [PATCH] --- yaml --- r: 15035 b: refs/heads/master c: dd815408106f3c56c3050493dda97f9355aa4971 h: refs/heads/master i: 15033: 32533e9624ce8ea45b11d2b30506a8a13df3463b 15031: 588f601d0f96b0a01518aafe7905147c7f024efc v: v3 --- [refs] | 2 +- trunk/drivers/media/video/ir-kbd-i2c.c | 2 +- trunk/include/linux/i2c-id.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index cbed204d4bad..09f399277c98 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3639c8619d50a6dea8fa106a5c61d848ffdcd3d6 +refs/heads/master: dd815408106f3c56c3050493dda97f9355aa4971 diff --git a/trunk/drivers/media/video/ir-kbd-i2c.c b/trunk/drivers/media/video/ir-kbd-i2c.c index 52c54b15fd4a..740e543311af 100644 --- a/trunk/drivers/media/video/ir-kbd-i2c.c +++ b/trunk/drivers/media/video/ir-kbd-i2c.c @@ -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, diff --git a/trunk/include/linux/i2c-id.h b/trunk/include/linux/i2c-id.h index ef3b5632e63a..006c81ef4d50 100644 --- a/trunk/include/linux/i2c-id.h +++ b/trunk/include/linux/i2c-id.h @@ -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