Skip to content

L
linux
Commit d8a6206d authored by Ben Dooks's avatar Ben Dooks
Browse files
Options

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

parents c09202ac c115167a
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
drivers/i2c/busses/Kconfig
View file @ d8a6206d
...@@ -496,8 +496,8 @@ config I2C_PMCMSP ...@@ -496,8 +496,8 @@ config I2C_PMCMSP
will be called i2c-pmcmsp. will be called i2c-pmcmsp.
config I2C_PNX config I2C_PNX
tristate "I2C bus support for Philips PNX targets" tristate "I2C bus support for Philips PNX and NXP LPC targets"
depends on ARCH_PNX4008 depends on ARCH_PNX4008 || ARCH_LPC32XX
help help
This driver supports the Philips IP3204 I2C IP block master and/or This driver supports the Philips IP3204 I2C IP block master and/or
slave controller slave controller
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7