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 4010fe92e72b637f6c138813a82c15c744b79ba3..d6d44946a283156e6d3829b6b6fca039ad331992 100644 (file)
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -124,6 +124,7 @@ config I2C_I801
            ICH6
            ICH7
            ESB2
            ICH6
            ICH7
            ESB2

+           ICH8

 
          This driver can also be built as a module.  If so, the module
          will be called i2c-i801.
 
          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
        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
            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
            SMSC Victory66
 
          This driver can also be built as a module.  If so, the module


@@ -236,27 +239,17 @@ config I2C_IXP2000
          This support is also available as a module. If so, the module
          will be called 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
        depends on I2C && PPC_PMAC

+       default y

        help
        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 support is also available as a module.  If so, the module 
-         will be called i2c-keywest.
-
-config I2C_PMAC_SMU
-       tristate "Powermac SMU I2C interface"
-       depends on I2C && PMAC_SMU
-       help
-         This supports the use of the I2C interface in the SMU
-         chip on recent Apple machines like the iMac G5.  It is used
-         among others by the thermal control driver for those 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
 
          This support is also available as a module.  If so, the module

-         will be called i2c-pmac-smu.
+         will be called i2c-powermac.

 
 config I2C_MPC
        tristate "MPC107/824x/85xx/52xx"
 
 config I2C_MPC
        tristate "MPC107/824x/85xx/52xx"


@@ -293,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.
          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.
          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.


@@ -398,10 +394,11 @@ config SCx200_I2C_SDA
          also be specified with a module parameter.
 
 config SCx200_ACB
          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
        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.
 
 
          If you don't know what to do here, say N.