diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-08-10 19:35:22 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-08-10 19:35:22 -0400 |
| commit | d8a6206d4f65f979dc3fee0962af509040b342dc (patch) | |
| tree | 6fc8fc2839082137746848fbe556bf2145f84a67 | |
| parent | c09202ac143eabdafe246a7e3e9ddba1fb35352a (diff) | |
| parent | c115167aef64717fb6b81cde957853ef16dd9551 (diff) | |
Merge branch 'for-2636/i2c/nxp' into next-i2c
| -rw-r--r-- | drivers/i2c/busses/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig index bceafbfa7268..77eabae4df8a 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig | |||
| @@ -496,8 +496,8 @@ config I2C_PMCMSP | |||
| 496 | will be called i2c-pmcmsp. | 496 | will be called i2c-pmcmsp. |
| 497 | 497 | ||
| 498 | config I2C_PNX | 498 | config I2C_PNX |
| 499 | tristate "I2C bus support for Philips PNX targets" | 499 | tristate "I2C bus support for Philips PNX and NXP LPC targets" |
| 500 | depends on ARCH_PNX4008 | 500 | depends on ARCH_PNX4008 || ARCH_LPC32XX |
| 501 | help | 501 | help |
| 502 | This driver supports the Philips IP3204 I2C IP block master and/or | 502 | This driver supports the Philips IP3204 I2C IP block master and/or |
| 503 | slave controller | 503 | slave controller |