openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Linus Torvalds 2014-03-13 21:25:40 -07:00
parent 53611c0ce9 62c19c9d29
commit c14c06b77d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/i2c/busses/Kconfig
View File

@ -387,7 +387,7 @@ config I2C_CBUS_GPIO
config I2C_CPM config I2C_CPM
tristate "Freescale CPM1 or CPM2 (MPC8xx/826x)" tristate "Freescale CPM1 or CPM2 (MPC8xx/826x)"
depends on (CPM1 || CPM2) && OF_I2C depends on CPM1 || CPM2
help help
This supports the use of the I2C interface on Freescale This supports the use of the I2C interface on Freescale
processors with CPM1 or CPM2. processors with CPM1 or CPM2.