aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-03-13 21:25:40 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-03-13 21:25:40 -0700
commitc14c06b77d151352a4de73505e954b6df55fd23b (patch)
treea37a5f47e92b854251efc53b9dfcfe748e822d53
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff)
parenti2c: Remove usage of orphaned symbol OF_I2C (diff)
downloadlinux-dev-c14c06b77d151352a4de73505e954b6df55fd23b.tar.xz
linux-dev-c14c06b77d151352a4de73505e954b6df55fd23b.zip
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
Diffstat (limited to '')
-rw-r--r--drivers/i2c/busses/Kconfig2
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
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.