aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@linux.intel.com>2013-11-27 09:40:20 +0100
committerSamuel Ortiz <sameo@linux.intel.com>2013-11-27 09:40:20 +0100
commit88ec6a4d836904a75bef87bfcd906193ad11d88a (patch)
tree8a901b1eafd0fb1000c42ae8c900b03ced011cae /drivers/mfd
parentmfd: lpc_ich: Fix Wildcat Point info name field (diff)
parentmfd: Make MFD_AS3722 depend on I2C=y (diff)
downloadlinux-dev-88ec6a4d836904a75bef87bfcd906193ad11d88a.tar.xz
linux-dev-88ec6a4d836904a75bef87bfcd906193ad11d88a.zip
Merge tag 'mfd-lee-3.13-fixes-1' of git://git.linaro.org/people/ljones/mfd
A single patch due in for v3.13-rc2
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 62a60caa5d1f..dd671582c9a1 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -32,7 +32,7 @@ config MFD_AS3722
select MFD_CORE
select REGMAP_I2C
select REGMAP_IRQ
- depends on I2C && OF
+ depends on I2C=y && OF
help
The ams AS3722 is a compact system PMU suitable for mobile phones,
tablets etc. It has 4 DC/DC step-down regulators, 3 DC/DC step-down