Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

[powerpc.git] / drivers / i2c / busses / Kconfig

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 9e56c39..90f91d0 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.
@@ -195,11 +196,11 @@ config I2C_IBM_IIC
          will be called i2c-ibm_iic.
 
 config I2C_IOP3XX
-       tristate "Intel IOP3xx and IXP4xx on-chip I2C interface"
-       depends on (ARCH_IOP3XX || ARCH_IXP4XX) && I2C
+       tristate "Intel IOPx3xx and IXP4xx on-chip I2C interface"
+       depends on (ARCH_IOP32X || ARCH_IOP33X || ARCH_IXP4XX || ARCH_IOP13XX) && I2C
        help
          Say Y here if you want to use the IIC bus controller on
-         the Intel IOP3xx I/O Processors or IXP4xx Network Processors.
+         the Intel IOPx3xx I/O Processors or IXP4xx Network Processors.
 
          This driver can also be built as a module.  If so, the module
          will be called i2c-iop3xx.
@@ -333,10 +334,10 @@ config I2C_PARPORT_LIGHT
 
          This driver is a light version of i2c-parport.  It doesn't depend
          on the parport driver, and uses direct I/O access instead.  This
-         might be prefered on embedded systems where wasting memory for
+         might be preferred on embedded systems where wasting memory for
          the clean but heavy parport handling is not an option.  The
          drawback is a reduced portability and the impossibility to
-         dasiy-chain other parallel port devices.
+         daisy-chain other parallel port devices.
          
          Don't say Y here if you said Y or M to i2c-parport.  Saying M to
          both is possible but both modules should not be loaded at the same