diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2011-03-20 22:14:04 +0000 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2011-03-20 22:14:04 +0000 |
| commit | e4394d553cec3cbf4d0c602fe39bc88bac43bd27 (patch) | |
| tree | 89db4a86ac03f74ca6bf0e7b00f8cbf044ff4ccf /drivers/i2c/busses/Kconfig | |
| parent | a952baa034ae7c2e4a66932005cbc7ebbccfe28d (diff) | |
| parent | 335d7c58fcc1b71387a2c38b610b08bb9d3a6fcc (diff) | |
| download | talos-obmc-linux-e4394d553cec3cbf4d0c602fe39bc88bac43bd27.tar.gz talos-obmc-linux-e4394d553cec3cbf4d0c602fe39bc88bac43bd27.zip | |
Merge branch 'for-2639/i2c/i2c-u2c12' into for-linus/2639/i2c-12
Diffstat (limited to 'drivers/i2c/busses/Kconfig')
| -rw-r--r-- | drivers/i2c/busses/Kconfig | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig index 230601e8853f..9294dc21861a 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig @@ -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 |
