diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-12-20 23:45:22 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-12-20 23:45:22 -0800 |
| commit | 14e5892a7e5bdbd3fb466e612d8cc921268b29ff (patch) | |
| tree | d060bb7d7ea649a138640b63e41ae7d3d70f7d97 | |
| parent | 27e623187ae9116cc74baa97bbe60e1754e790c4 (diff) | |
| parent | 2a16792344fae47d8c1e4b0610b7473a29413492 (diff) | |
Merge "power: power_supply: Add property for ship mode"
| -rw-r--r-- | drivers/power/power_supply_sysfs.c | 1 | ||||
| -rw-r--r-- | include/linux/power_supply.h | 1 |
2 files changed, 2 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 *' */ diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h index 125568f7862c..9b6359241018 100644 --- a/include/linux/power_supply.h +++ b/include/linux/power_supply.h @@ -226,6 +226,7 @@ enum power_supply_property { POWER_SUPPLY_PROP_PARALLEL_DISABLE, POWER_SUPPLY_PROP_PARALLEL_PERCENT, POWER_SUPPLY_PROP_PE_START, + POWER_SUPPLY_PROP_SET_SHIP_MODE, /* Local extensions of type int64_t */ POWER_SUPPLY_PROP_CHARGE_COUNTER_EXT, /* Properties of type `const char *' */ |