aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2015-11-13 10:42:21 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2015-11-13 10:42:21 +1100
commited07a4bbd4b69f269fe514410b7b38d74a082254 (patch)
tree973206da85010393e4265c5396a8faaace0ffa49
parenta7546cdd213f8e5143911b4625d6649fe4fadc2d (diff)
parent0fe69b960ae208e7f3c824226fa21712942f3f2f (diff)
Merge remote-tracking branch 'battery/master'
-rw-r--r--drivers/power/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index 237d7aa73e8c..2f944d742ed4 100644
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -166,6 +166,7 @@ config BATTERY_BQ27XXX_I2C
bool "BQ27xxx I2C support"
depends on BATTERY_BQ27XXX
depends on I2C
+ depends on !(I2C=m && BATTERY_BQ27XXX=y)
default y
help
Say Y here to enable support for batteries with BQ27xxx (I2C) chips.