diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-12 15:30:15 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-12 15:30:15 -0500 |
commit | 20234989a8ae0ff418e2acdef72205fb7cb3f819 (patch) | |
tree | 6888e6c6b8f2beef67b3f85570aebb853f8443f9 /include/linux/i2c-id.h | |
parent | 92f268e034faf793f6d40de2f0fc81478a14ff39 (diff) | |
parent | 49d7bc64283970ee83d2c954d04ba00d04e5943d (diff) | |
download | talos-op-linux-20234989a8ae0ff418e2acdef72205fb7cb3f819.tar.gz talos-op-linux-20234989a8ae0ff418e2acdef72205fb7cb3f819.zip |
Merge branch 'master'
Diffstat (limited to 'include/linux/i2c-id.h')
-rw-r--r-- | include/linux/i2c-id.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ #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 |