diff options
| author | Mauro Carvalho Chehab <devnull@localhost> | 2005-12-08 21:02:56 +0000 |
|---|---|---|
| committer | Mauro Carvalho Chehab <devnull@localhost> | 2005-12-08 21:02:56 +0000 |
| commit | b290c2ad0e5f022247ee7ed9136cda6b850e59a0 (patch) | |
| tree | fcd76783f4b653b32d75b9b93fd81d74cba715b2 | |
| parent | 4a0bc2494ff86d39226766e62c3bbccc3c0cc3ed (diff) | |
| download | mediapointer-dvb-s2-b290c2ad0e5f022247ee7ed9136cda6b850e59a0.tar.gz mediapointer-dvb-s2-b290c2ad0e5f022247ee7ed9136cda6b850e59a0.tar.bz2 | |
I2C ID renamed to I2C_DRIVERID_INFRARED
I2C ID renamed to I2C_DRIVERID_INFRARED
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
| -rw-r--r-- | linux/drivers/media/video/ir-kbd-i2c.c | 4 | ||||
| -rw-r--r-- | linux/include/linux/i2c-id.h | 2 | ||||
| -rw-r--r-- | v4l/ChangeLog | 9 |
3 files changed, 12 insertions, 3 deletions
diff --git a/linux/drivers/media/video/ir-kbd-i2c.c b/linux/drivers/media/video/ir-kbd-i2c.c index a1673ca59..01b4f3f11 100644 --- a/linux/drivers/media/video/ir-kbd-i2c.c +++ b/linux/drivers/media/video/ir-kbd-i2c.c @@ -1,5 +1,5 @@ /* - * $Id: ir-kbd-i2c.c,v 1.29 2005/12/04 01:12:43 rmcc Exp $ + * $Id: ir-kbd-i2c.c,v 1.30 2005/12/08 21:02:56 mchehab Exp $ * * keyboard input driver for i2c IR remote controls * @@ -281,7 +281,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/linux/include/linux/i2c-id.h b/linux/include/linux/i2c-id.h index ef3b5632e..006c81ef4 100644 --- a/linux/include/linux/i2c-id.h +++ b/linux/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 diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 9cb941a2a..511da99b6 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,12 @@ +2005-12-08 20:59 mchehab + + * linux/drivers/media/video/ir-kbd-i2c.c: + * linux/include/linux/i2c-id.h: + + - I2C ID renamed to I2C_DRIVERID_INFRARED + + Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> + 2005-12-08 20:57 mkrufky * linux/drivers/media/video/cx88/Kconfig: |