aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorWolfram Sang <wsa@the-dreams.de>2014-03-06 04:08:50 -0500
committerWolfram Sang <wsa@the-dreams.de>2014-03-06 15:30:00 -0500
commit80c69915e5fbe6493119d87eee2a2a6a7115c74c (patch)
treea5d124404173d175ace98675d97c65473d08e3c6 /drivers/i2c
parentc7dcb1fec059c429f5096d20ab9e0f439fcfa909 (diff)
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 70bcad941657..f8162441576f 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -527,8 +527,7 @@ config I2C_MPC
527 527
528config I2C_MV64XXX 528config I2C_MV64XXX
529 tristate "Marvell mv64xxx I2C Controller" 529 tristate "Marvell mv64xxx I2C Controller"
530 depends on (MV64X60 || PLAT_ORION || ARCH_SUNXI) 530 depends on MV64X60 || PLAT_ORION || ARCH_SUNXI
531 select RESET_CONTROLLER
532 help 531 help
533 If you say yes to this option, support will be included for the 532 If you say yes to this option, support will be included for the
534 built-in I2C interface on the Marvell 64xxx line of host bridges. 533 built-in I2C interface on the Marvell 64xxx line of host bridges.