summaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorWolfram Sang <wsa@the-dreams.de>2014-03-06 10:08:50 +0100
committerWolfram Sang <wsa@the-dreams.de>2014-03-06 21:30:00 +0100
commit80c69915e5fbe6493119d87eee2a2a6a7115c74c (patch)
treea5d124404173d175ace98675d97c65473d08e3c6 /drivers/i2c
parentc7dcb1fec059c429f5096d20ab9e0f439fcfa909 (diff)
downloadop-kernel-dev-80c69915e5fbe6493119d87eee2a2a6a7115c74c.zip
op-kernel-dev-80c69915e5fbe6493119d87eee2a2a6a7115c74c.tar.gz
i2c: mv64xxx: fix circular Kconfig dependency
Commit 370136bc67c3 ("i2c: mv64xxx: Add reset deassert call") introduced: drivers/video/Kconfig:42:error: recursive dependency detected! ARCH_SUNXI selects RESET_CONTROLLER anyhow. Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/busses/Kconfig3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 70bcad9..f816244 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -527,8 +527,7 @@ config I2C_MPC
config I2C_MV64XXX
tristate "Marvell mv64xxx I2C Controller"
- depends on (MV64X60 || PLAT_ORION || ARCH_SUNXI)
- select RESET_CONTROLLER
+ depends on MV64X60 || PLAT_ORION || ARCH_SUNXI
help
If you say yes to this option, support will be included for the
built-in I2C interface on the Marvell 64xxx line of host bridges.
OpenPOWER on IntegriCloud