diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 02:43:09 +0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 02:43:09 +0400 |
commit | c0d6f9663b30a09ed725229b2d50391268c8538e (patch) | |
tree | 7ba471cf9632097682ab55689cd64c9a68e11235 /drivers/i2c/busses/Kconfig | |
parent | 0db7443b2bd0b92da4e8afa46f8123a7076136c6 (diff) | |
parent | 6fd60fa97b706e52abba7c9f810b148aa230817f (diff) | |
download | linux-c0d6f9663b30a09ed725229b2d50391268c8538e.tar.xz |
Merge master.kernel.org:/home/rmk/linux-2.6-i2c manually
Old tree, so the automatic merge had some problems.
Diffstat (limited to 'drivers/i2c/busses/Kconfig')
-rw-r--r-- | drivers/i2c/busses/Kconfig | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig index 6e9da1372225..8334496a7e0a 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig @@ -144,6 +144,22 @@ config I2C_I810 This driver can also be built as a module. If so, the module will be called i2c-i810. +config I2C_PXA + tristate "Intel PXA2XX I2C adapter (EXPERIMENTAL)" + depends on I2C && EXPERIMENTAL && ARCH_PXA + help + If you have devices in the PXA I2C bus, say yes to this option. + This driver can also be built as a module. If so, the module + will be called i2c-pxa. + +config I2C_PXA_SLAVE + bool "Intel PXA2XX I2C Slave comms support" + depends on I2C_PXA + help + Support I2C slave mode communications on the PXA I2C bus. This + is necessary for systems where the PXA may be a target on the + I2C bus. + config I2C_PIIX4 tristate "Intel PIIX4" depends on I2C && PCI |