korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 12:28:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ben Dooks 2010-08-11 00:35:22 +01:00
commit d8a6206d4f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/i2c/busses/Kconfig
View File

@ -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