redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases 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
parent c09202ac14 c115167aef
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