Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

[pandora-kernel.git] / drivers / i2c / busses / Kconfig

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 884320e..90f91d0 100644 (file)
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -75,11 +75,11 @@ config I2C_AMD8111
          will be called i2c-amd8111.
 
 config I2C_AU1550
-       tristate "Au1550 SMBus interface"
-       depends on I2C && SOC_AU1550
+       tristate "Au1550/Au1200 SMBus interface"
+       depends on I2C && (SOC_AU1550 || SOC_AU1200)
        help
          If you say yes to this option, support will be included for the
-         Au1550 SMBus interface.
+         Au1550 and Au1200 SMBus interface.
 
          This driver can also be built as a module.  If so, the module
          will be called i2c-au1550.
@@ -125,6 +125,7 @@ config I2C_I801
            ICH7
            ESB2
            ICH8
+           ICH9
 
          This driver can also be built as a module.  If so, the module
          will be called i2c-i801.
@@ -195,11 +196,11 @@ config I2C_IBM_IIC
          will be called i2c-ibm_iic.
 
 config I2C_IOP3XX
-       tristate "Intel IOP3xx and IXP4xx on-chip I2C interface"
-       depends on (ARCH_IOP3XX || ARCH_IXP4XX) && I2C
+       tristate "Intel IOPx3xx and IXP4xx on-chip I2C interface"
+       depends on (ARCH_IOP32X || ARCH_IOP33X || ARCH_IXP4XX || ARCH_IOP13XX) && I2C
        help
          Say Y here if you want to use the IIC bus controller on
-         the Intel IOP3xx I/O Processors or IXP4xx Network Processors.
+         the Intel IOPx3xx I/O Processors or IXP4xx Network Processors.
 
          This driver can also be built as a module.  If so, the module
          will be called i2c-iop3xx.
@@ -287,6 +288,16 @@ config I2C_OCORES
          This driver can also be built as a module.  If so, the module
          will be called i2c-ocores.
 
+config I2C_OMAP
+       tristate "OMAP I2C adapter"
+       depends on I2C && ARCH_OMAP
+       default y if MACH_OMAP_H3 || MACH_OMAP_OSK
+       help
+         If you say yes to this option, support will be included for the
+         I2C interface on the Texas Instruments OMAP1/2 family of processors.
+         Like OMAP1510/1610/1710/5912 and OMAP242x.
+         For details see http://www.ti.com/omap.
+
 config I2C_PARPORT
        tristate "Parallel port adapter"
        depends on I2C && PARPORT
@@ -323,10 +334,10 @@ config I2C_PARPORT_LIGHT
 
          This driver is a light version of i2c-parport.  It doesn't depend
          on the parport driver, and uses direct I/O access instead.  This
-         might be prefered on embedded systems where wasting memory for
+         might be preferred on embedded systems where wasting memory for
          the clean but heavy parport handling is not an option.  The
          drawback is a reduced portability and the impossibility to
-         dasiy-chain other parallel port devices.
+         daisy-chain other parallel port devices.
          
          Don't say Y here if you said Y or M to i2c-parport.  Saying M to
          both is possible but both modules should not be loaded at the same
@@ -482,19 +493,19 @@ config I2C_VIA
          will be called i2c-via.
 
 config I2C_VIAPRO
-       tristate "VIA 82C596/82C686/823x"
+       tristate "VIA 82C596/82C686/82xx"
        depends on I2C && PCI
        help
          If you say yes to this option, support will be included for the VIA
-         82C596/82C686/823x I2C interfaces.  Specifically, the following 
+         82C596/82C686/82xx I2C interfaces.  Specifically, the following
          chipsets are supported:
-         82C596A/B
-         82C686A/B
-         8231
-         8233
-         8233A
-         8235
-         8237
+           VT82C596A/B
+           VT82C686A/B
+           VT8231
+           VT8233/A
+           VT8235
+           VT8237R/A
+           VT8251
 
          This driver can also be built as a module.  If so, the module
          will be called i2c-viapro.