diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-14 00:25:40 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-14 00:25:40 -0400 |
| commit | c14c06b77d151352a4de73505e954b6df55fd23b (patch) | |
| tree | a37a5f47e92b854251efc53b9dfcfe748e822d53 | |
| parent | 53611c0ce9f6e2fa2e31f9ab4ad8c08c512085ba (diff) | |
| parent | 62c19c9d29e65086e5ae76df371ed2e6b23f00cd (diff) | |
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
| -rw-r--r-- | drivers/i2c/busses/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig index f5ed03164d86..de17c5593d97 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig | |||
| @@ -387,7 +387,7 @@ config I2C_CBUS_GPIO | |||
| 387 | 387 | ||
| 388 | config I2C_CPM | 388 | config I2C_CPM |
| 389 | tristate "Freescale CPM1 or CPM2 (MPC8xx/826x)" | 389 | tristate "Freescale CPM1 or CPM2 (MPC8xx/826x)" |
| 390 | depends on (CPM1 || CPM2) && OF_I2C | 390 | depends on CPM1 || CPM2 |
| 391 | help | 391 | help |
| 392 | This supports the use of the I2C interface on Freescale | 392 | This supports the use of the I2C interface on Freescale |
| 393 | processors with CPM1 or CPM2. | 393 | processors with CPM1 or CPM2. |