aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/i2c-id.h
diff options
context:
space:
mode:
authorDmitry Torokhov <dtor_core@ameritech.net>2005-12-20 23:03:50 -0500
committerDmitry Torokhov <dtor_core@ameritech.net>2005-12-20 23:03:50 -0500
commit041387d98460b3947587929ef3a4773b8c48538f (patch)
tree3330eebba3fa1aa7c13479e527f07b03d7fb53ed /include/linux/i2c-id.h
parent56f0356321a876a1a356712f2486d6188a3b4992 (diff)
parentb05948d9b7167e23af88cc65b9ffa4687eaf1f0d (diff)
downloadkernel_samsung_espresso10-041387d98460b3947587929ef3a4773b8c48538f.zip
kernel_samsung_espresso10-041387d98460b3947587929ef3a4773b8c48538f.tar.gz
kernel_samsung_espresso10-041387d98460b3947587929ef3a4773b8c48538f.tar.bz2
Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)
Diffstat (limited to 'include/linux/i2c-id.h')
-rw-r--r--include/linux/i2c-id.h2
1 files changed, 1 insertions, 1 deletions
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