summaryrefslogtreecommitdiff
path: root/drivers/power
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-12-20 23:45:22 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2016-12-20 23:45:22 -0800
commit14e5892a7e5bdbd3fb466e612d8cc921268b29ff (patch)
treed060bb7d7ea649a138640b63e41ae7d3d70f7d97 /drivers/power
parent27e623187ae9116cc74baa97bbe60e1754e790c4 (diff)
parent2a16792344fae47d8c1e4b0610b7473a29413492 (diff)
Merge "power: power_supply: Add property for ship mode"
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/power_supply_sysfs.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
index d83928901a77..a4aee80798e4 100644
--- a/drivers/power/power_supply_sysfs.c
+++ b/drivers/power/power_supply_sysfs.c
@@ -277,6 +277,7 @@ static struct device_attribute power_supply_attrs[] = {
POWER_SUPPLY_ATTR(parallel_disable),
POWER_SUPPLY_ATTR(parallel_percent),
POWER_SUPPLY_ATTR(pe_start),
+ POWER_SUPPLY_ATTR(set_ship_mode),
/* Local extensions of type int64_t */
POWER_SUPPLY_ATTR(charge_counter_ext),
/* Properties of type `const char *' */