diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-03 20:34:14 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-03 20:34:14 -0500 |
commit | 4ef679e6caf1261b6380a610a705a90d7e2738c6 (patch) | |
tree | 6b59360c267508647ae4492f171668ef6ce82e32 /include/linux | |
parent | 98ac62defe529d04a192688f40d801a2d8fbcf98 (diff) | |
parent | 9a40525788a1b692ee0fc780a8cdb2ac808de1b0 (diff) |
Merge branch 'upstream-fixes'
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/i2c-id.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h index 1543daaa9c5e..ef3b5632e63a 100644 --- a/include/linux/i2c-id.h +++ b/include/linux/i2c-id.h | |||
@@ -108,6 +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 | 112 | ||
112 | #define I2C_DRIVERID_EXP0 0xF0 /* experimental use id's */ | 113 | #define I2C_DRIVERID_EXP0 0xF0 /* experimental use id's */ |
113 | #define I2C_DRIVERID_EXP1 0xF1 | 114 | #define I2C_DRIVERID_EXP1 0xF1 |