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

d8a6206d · Ben Dooks · c09202ac · c115167a · d8a6206d
Commit d8a6206d authored Aug 11, 2010 by Ben Dooks
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

drivers/i2c/busses/Kconfig drivers/i2c/busses/Kconfig +2 -2

No files found.
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -496,8 +496,8 @@ config I2C_PMCMSP
 	  will be called i2c-pmcmsp.

 config I2C_PNX
-	tristate "I2C bus support for Philips PNX targets"
-	depends on ARCH_PNX4008
+	tristate "I2C bus support for Philips PNX and NXP LPC targets"
+	depends on ARCH_PNX4008 || ARCH_LPC32XX
 	help
 	  This driver supports the Philips IP3204 I2C IP block master and/or
 	  slave controller