diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-29 16:15:57 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-29 16:15:57 -0700 |
commit | 44234d0c465d996145e9c821fa28a981f2e8309d (patch) | |
tree | 0ffdc6949e885e2234933610296ad1f0e14b0515 /drivers/i2c/busses/Kconfig | |
parent | 91ab9bf7c5322128d3b29c04393268658631e26a (diff) | |
parent | 9cc11dee3ddf140e39b0088688bfe5ee45d63b41 (diff) | |
download | blackbird-op-linux-44234d0c465d996145e9c821fa28a981f2e8309d.tar.gz blackbird-op-linux-44234d0c465d996145e9c821fa28a981f2e8309d.zip |
Merge branch 'for-2637/i2c-all' of git://git.fluff.org/bjdooks/linux
* 'for-2637/i2c-all' of git://git.fluff.org/bjdooks/linux:
i2c-intel-mid: Driver depends on PCI
i2c-intel-mid: support for Moorestown and Medfield platform
i2c-nomadik: fixup bus delays
i2c-nomadik: support smbus emulation
i2c-nomadik: dynamic clocking
i2c-nomadik: documentation fixes
i2c-s3c2410: Enable i2c clock only when doing some transfert
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 fd455a2fdd12..c950be3cce21 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig @@ -396,6 +396,16 @@ config I2C_IMX This driver can also be built as a module. If so, the module will be called i2c-imx. +config I2C_INTEL_MID + tristate "Intel Moorestown/Medfield Platform I2C controller" + depends on PCI + help + Say Y here if you have an Intel Moorestown/Medfield platform I2C + controller. + + This support is also available as a module. If so, the module + will be called i2c-intel-mid. + config I2C_IOP3XX tristate "Intel IOPx3xx and IXP4xx on-chip I2C interface" depends on ARCH_IOP32X || ARCH_IOP33X || ARCH_IXP4XX || ARCH_IOP13XX |