linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index d6d4494..0188a9d 100644 (file)
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -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.
@@ -168,14 +169,12 @@ 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 (note that Serverworks is part
-         of Broadcom):
+         versions of the chipset are supported:
            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
@@ -286,10 +285,7 @@ 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.
@@ -394,11 +390,10 @@ config SCx200_I2C_SDA
          also be specified with a module parameter.
 
 config SCx200_ACB
-       tristate "Geode ACCESS.bus support"
-       depends on X86_32 && I2C && PCI
+       tristate "NatSemi SCx200 ACCESS.bus"
+       depends on I2C && PCI
        help
-         Enable the use of the ACCESS.bus controllers on the Geode SCx200 and
-         SC1100 processors and the CS5535 and CS5536 Geode companion devices.
+         Enable the use of the ACCESS.bus controllers of a SCx200 processor.
 
          If you don't know what to do here, say N.
 
@@ -468,19 +463,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.