Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8a6206d authored by Ben Dooks's avatar Ben Dooks
Browse files

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

parents c09202ac c115167a
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -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