diff options
| author | Mauro Carvalho Chehab <mchehab@brturbo.com.br> | 2005-12-12 08:37:31 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-12 16:57:45 (GMT) |
| commit | dd815408106f3c56c3050493dda97f9355aa4971 (patch) | |
| tree | 032811558e78801ed93e249c86265abb8c849af7 | |
| parent | 3639c8619d50a6dea8fa106a5c61d848ffdcd3d6 (diff) | |
| download | linux-dd815408106f3c56c3050493dda97f9355aa4971.tar.xz | |
[PATCH] V4L/DVB: (3151) I2C ID renamed to I2C_DRIVERID_INFRARED
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>
| -rw-r--r-- | drivers/media/video/ir-kbd-i2c.c | 2 | ||||
| -rw-r--r-- | include/linux/i2c-id.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c index 52c54b1..740e543 100644 --- a/drivers/media/video/ir-kbd-i2c.c +++ b/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/include/linux/i2c-id.h b/include/linux/i2c-id.h index ef3b563..006c81e 100644 --- a/include/linux/i2c-id.h +++ b/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 |