Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6

[linux-2.6-omap-h63xx.git] / drivers / i2c / busses / Kconfig

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 08d5b8fed2dc5f3440526110d9d5b13106a04174..d6d44946a283156e6d3829b6b6fca039ad331992 100644 (file)
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -124,6 +124,7 @@ config I2C_I801
            ICH6
            ICH7
            ESB2
+           ICH8
 
          This driver can also be built as a module.  If so, the module
          will be called i2c-i801.
@@ -167,12 +168,14 @@ config I2C_PIIX4
        help
          If you say yes to this option, support will be included for the Intel
          PIIX4 family of mainboard I2C interfaces.  Specifically, the following
-         versions of the chipset are supported:
+         versions of the chipset are supported (note that Serverworks is part
+         of Broadcom):
            Intel PIIX4
            Intel 440MX
            Serverworks OSB4
            Serverworks CSB5
            Serverworks CSB6
+           Serverworks HT-1000
            SMSC Victory66
 
          This driver can also be built as a module.  If so, the module
@@ -283,7 +286,10 @@ config I2C_PARPORT
          This driver is a replacement for (and was inspired by) an older
          driver named i2c-philips-par.  The new driver supports more devices,
          and makes it easier to add support for new devices.
-         
+
+         An adapter type parameter is now mandatory.  Please read the file
+         Documentation/i2c/busses/i2c-parport for details.
+
          Another driver exists, named i2c-parport-light, which doesn't depend
          on the parport driver.  This is meant for embedded systems. Don't say
          Y here if you intend to say Y or M there.
@@ -388,10 +394,11 @@ config SCx200_I2C_SDA
          also be specified with a module parameter.
 
 config SCx200_ACB
-       tristate "NatSemi SCx200 ACCESS.bus"
-       depends on I2C && PCI
+       tristate "Geode ACCESS.bus support"
+       depends on X86_32 && I2C && PCI
        help
-         Enable the use of the ACCESS.bus controllers of a SCx200 processor.
+         Enable the use of the ACCESS.bus controllers on the Geode SCx200 and
+         SC1100 processors and the CS5535 and CS5536 Geode companion devices.
 
          If you don't know what to do here, say N.