diff options
-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 52c54b15fd4a..740e543311af 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); | |||
279 | 279 | ||
280 | static struct i2c_driver driver = { | 280 | static struct i2c_driver driver = { |
281 | .name = "ir remote kbd driver", | 281 | .name = "ir remote kbd driver", |
282 | .id = I2C_DRIVERID_I2C_IR, | 282 | .id = I2C_DRIVERID_INFRARED, |
283 | .flags = I2C_DF_NOTIFY, | 283 | .flags = I2C_DF_NOTIFY, |
284 | .attach_adapter = ir_probe, | 284 | .attach_adapter = ir_probe, |
285 | .detach_client = ir_detach, | 285 | .detach_client = ir_detach, |
diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h index ef3b5632e63a..006c81ef4d50 100644 --- a/include/linux/i2c-id.h +++ b/include/linux/i2c-id.h | |||
@@ -108,7 +108,7 @@ | |||
108 | #define I2C_DRIVERID_SAA7127 72 /* saa7124 video encoder */ | 108 | #define I2C_DRIVERID_SAA7127 72 /* saa7124 video encoder */ |
109 | #define I2C_DRIVERID_SAA711X 73 /* saa711x video encoders */ | 109 | #define I2C_DRIVERID_SAA711X 73 /* saa711x video encoders */ |
110 | #define I2C_DRIVERID_AKITAIOEXP 74 /* IO Expander on Sharp SL-C1000 */ | 110 | #define I2C_DRIVERID_AKITAIOEXP 74 /* IO Expander on Sharp SL-C1000 */ |
111 | #define I2C_DRIVERID_I2C_IR 75 /* I2C InfraRed on Video boards */ | 111 | #define I2C_DRIVERID_INFRARED 75 /* I2C InfraRed on Video boards */ |
112 | 112 | ||
113 | #define I2C_DRIVERID_EXP0 0xF0 /* experimental use id's */ | 113 | #define I2C_DRIVERID_EXP0 0xF0 /* experimental use id's */ |
114 | #define I2C_DRIVERID_EXP1 0xF1 | 114 | #define I2C_DRIVERID_EXP1 0xF1 |