Merge branch 'for-2639/i2c/i2c-u2c12' into for-linus/2639/i2c-12

This commit is contained in:
Ben Dooks
2011-03-20 22:14:04 +00:00
5 changed files with 578 additions and 0 deletions
+10
View File
@@ -676,6 +676,16 @@ config I2C_EG20T
comment "External I2C/SMBus adapter drivers"
config I2C_DIOLAN_U2C
tristate "Diolan U2C-12 USB adapter"
depends on USB
help
If you say yes to this option, support will be included for Diolan
U2C-12, a USB to I2C interface.
This driver can also be built as a module. If so, the module
will be called i2c-diolan-u2c.
config I2C_PARPORT
tristate "Parallel port adapter"
depends on PARPORT