Skip to content

Commit

Permalink
Merge branch 'for-2636/i2c/nxp' into next-i2c
Browse files Browse the repository at this point in the history
  • Loading branch information
Ben Dooks committed Aug 10, 2010
2 parents c09202a + c115167 commit d8a6206
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/i2c/busses/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit d8a6206

Please sign in to comment.