Merge master.kernel.org:/home/rmk/linux-2.6-i2c manually

[sfrench/cifs-2.6.git] / drivers / i2c / busses / Kconfig

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 916ba5e40a96dd9810a0e4014cefb46541054475..8334496a7e0aee02b42ca7b4953a165d2efb91e1 100644 (file)
--- 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
@@ -182,14 +198,8 @@ config I2C_IOP3XX
          will be called i2c-iop3xx.
 
 config I2C_ISA
-       tristate "ISA Bus support"
+       tristate
        depends on I2C
-       help
-         If you say yes to this option, support will be included for i2c
-         interfaces that are on the ISA bus.
-
-         This driver can also be built as a module.  If so, the module
-         will be called i2c-isa.
 
 config I2C_ITE
        tristate "ITE I2C Adapter"