Home Home > GIT Browse > stable-xen
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Mahoney <jeffm@suse.com>2017-07-18 09:55:43 -0400
committerJeff Mahoney <jeffm@suse.com>2017-07-18 09:55:43 -0400
commitf3760298e27c0e29e2a70bfffba7bad2d014db9b (patch)
tree46cd0ce91f08ff90870793fe4d9995f2d2001d3c
parente078376009b7b63c698e3ec23da13daa3d3fdca7 (diff)
parent7d005f80f6e80ca40c27e243a6eb4c26800fcce5 (diff)
Merge remote-tracking branch 'origin/users/afaerber/master/for-next'
Config update was already merged. This one just contains: CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM=n for arm64/default.
-rw-r--r--config/arm64/default2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/arm64/default b/config/arm64/default
index 21c3fb3fea..286b93b710 100644
--- a/config/arm64/default
+++ b/config/arm64/default
@@ -4206,7 +4206,7 @@ CONFIG_BATTERY_SBS=m
CONFIG_CHARGER_SBS=m
CONFIG_BATTERY_BQ27XXX=m
CONFIG_BATTERY_BQ27XXX_I2C=m
-CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM=y
+# CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM is not set
CONFIG_CHARGER_AXP20X=m
CONFIG_BATTERY_AXP20X=m
CONFIG_AXP20X_POWER=m