diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-08-11 00:35:22 +0100 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-08-11 00:35:22 +0100 |
| commit | d8a6206d4f65f979dc3fee0962af509040b342dc (patch) | |
| tree | 6fc8fc2839082137746848fbe556bf2145f84a67 /drivers/i2c | |
| parent | c09202ac143eabdafe246a7e3e9ddba1fb35352a (diff) | |
| parent | c115167aef64717fb6b81cde957853ef16dd9551 (diff) | |
| download | kernel_samsung_tuna-d8a6206d4f65f979dc3fee0962af509040b342dc.zip kernel_samsung_tuna-d8a6206d4f65f979dc3fee0962af509040b342dc.tar.gz kernel_samsung_tuna-d8a6206d4f65f979dc3fee0962af509040b342dc.tar.bz2 | |
Merge branch 'for-2636/i2c/nxp' into next-i2c
Diffstat (limited to 'drivers/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 bceafbf..77eabae 100644 --- 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 |