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

Commit c14c06b7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux 

Pull i2c Kconfig fix from Wolfram Sang.

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: Remove usage of orphaned symbol OF_I2C
parents 53611c0c 62c19c9d

drivers/i2c/busses/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -387,7 +387,7 @@ config I2C_CBUS_GPIO 


config I2C_CPM

	tristate "Freescale CPM1 or CPM2 (MPC8xx/826x)"

	depends on (CPM1 || CPM2) && OF_I2C

	depends on CPM1 || CPM2

	help

	  This supports the use of the I2C interface on Freescale

	  processors with CPM1 or CPM2.