Merge branch 'for-2636/i2c/nxp' into next-i2c

This commit is contained in:
Ben Dooks 2010-08-11 00:35:22 +01:00
commit d8a6206d4f

View File

@ -496,8 +496,8 @@ config I2C_PMCMSP
will be called i2c-pmcmsp. will be called i2c-pmcmsp.
config I2C_PNX config I2C_PNX
tristate "I2C bus support for Philips PNX targets" tristate "I2C bus support for Philips PNX and NXP LPC targets"
depends on ARCH_PNX4008 depends on ARCH_PNX4008 || ARCH_LPC32XX
help help
This driver supports the Philips IP3204 I2C IP block master and/or This driver supports the Philips IP3204 I2C IP block master and/or
slave controller slave controller