vserver 2.0 rc7

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

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 3d06bf9..a0018de 100644 (file)
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -108,7 +108,7 @@ config I2C_HYDRA
          will be called i2c-hydra.
 
 config I2C_I801
-       tristate "Intel 801"
+       tristate "Intel 82801 (ICH)"
        depends on I2C && PCI && EXPERIMENTAL
        help
          If you say yes to this option, support will be included for the Intel
@@ -119,10 +119,11 @@ config I2C_I801
            82801BA
            82801CA/CAM
            82801DB
-           82801EB
+           82801EB/ER (ICH5/ICH5R)
            6300ESB
            ICH6
            ICH7
+           ESB2
 
          This driver can also be built as a module.  If so, the module
          will be called i2c-i801.
@@ -143,6 +144,23 @@ config I2C_I810
          This driver can also be built as a module.  If so, the module
          will be called i2c-i810.
 
+config I2C_PIIX4
+       tristate "Intel PIIX4"
+       depends on I2C && PCI
+       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:
+           Intel PIIX4
+           Intel 440MX
+           Serverworks OSB4
+           Serverworks CSB5
+           Serverworks CSB6
+           SMSC Victory66
+
+         This driver can also be built as a module.  If so, the module
+         will be called i2c-piix4.
+
 config I2C_IBM_IIC
        tristate "IBM PPC 4xx on-chip I2C interface"
        depends on IBM_OCP && I2C
@@ -219,7 +237,7 @@ config I2C_KEYWEST
 
 config I2C_MPC
        tristate "MPC107/824x/85xx/52xx"
-       depends on I2C && PPC
+       depends on I2C && PPC32
        help
          If you say yes to this option, support will be included for the
          built-in I2C interface on the MPC107/Tsi107/MPC8240/MPC8245 and
@@ -285,23 +303,6 @@ config I2C_PARPORT_LIGHT
          This support is also available as a module.  If so, the module 
          will be called i2c-parport-light.
 
-config I2C_PIIX4
-       tristate "Intel PIIX4"
-       depends on I2C && PCI && EXPERIMENTAL && !64BIT
-       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:
-           Intel PIIX4
-           Intel 440MX
-           Serverworks OSB4
-           Serverworks CSB5
-           Serverworks CSB6
-           SMSC Victory66
-
-         This driver can also be built as a module.  If so, the module
-         will be called i2c-piix4.
-
 config I2C_PROSAVAGE
        tristate "S3/VIA (Pro)Savage"
        depends on I2C && PCI && EXPERIMENTAL
@@ -486,4 +487,14 @@ config I2C_PCA_ISA
          This driver can also be built as a module.  If so, the module
          will be called i2c-pca-isa.
 
+config I2C_MV64XXX
+       tristate "Marvell mv64xxx I2C Controller"
+       depends on I2C && MV64X60 && EXPERIMENTAL
+       help
+         If you say yes to this option, support will be included for the
+         built-in I2C interface on the Marvell 64xxx line of host bridges.
+
+         This driver can also be built as a module.  If so, the module
+         will be called i2c-mv64xxx.
+
 endmenu