Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

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

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 8334496a7e0aee02b42ca7b4953a165d2efb91e1..ff92735c7c85706c2424e3b8445ac30e7d36eaca 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.
@@ -135,11 +136,12 @@ config I2C_I810
        help
          If you say yes to this option, support will be included for the Intel
          810/815 family of mainboard I2C interfaces.  Specifically, the 
-         following versions of the chipset is supported:
+         following versions of the chipset are supported:
            i810AA
            i810AB
            i810E
            i815
+           i845G
 
          This driver can also be built as a module.  If so, the module
          will be called i2c-i810.
@@ -235,15 +237,17 @@ config I2C_IXP2000
          This support is also available as a module. If so, the module
          will be called i2c-ixp2000.
 
-config I2C_KEYWEST
-       tristate "Powermac Keywest I2C interface"
+config I2C_POWERMAC
+       tristate "Powermac I2C interface"
        depends on I2C && PPC_PMAC
+       default y
        help
-         This supports the use of the I2C interface in the combo-I/O
-         chip on recent Apple machines.  Say Y if you have such a machine.
+         This exposes the various PowerMac i2c interfaces to the linux i2c
+         layer and to userland. It is used by various drivers on the powemac
+         platform, thus should generally be enabled.
 
-         This support is also available as a module.  If so, the module 
-         will be called i2c-keywest.
+         This support is also available as a module.  If so, the module
+         will be called i2c-powermac.
 
 config I2C_MPC
        tristate "MPC107/824x/85xx/52xx"