diff options
| author | Sebastian Reichel <sre@kernel.org> | 2018-08-16 22:19:22 +0200 |
|---|---|---|
| committer | Sebastian Reichel <sre@kernel.org> | 2018-08-16 22:19:22 +0200 |
| commit | 5198a48381455969aa1053a0ca2e4ce409be2fc2 (patch) | |
| tree | 881914c4a5349e45285d686b1a513c678fcd6894 /include/linux | |
| parent | 3d779180c69261f5c713832e46763e38589c18d3 (diff) | |
| parent | cc44ba91166beb78f9cb29d5e3d41c0a2d0a7329 (diff) | |
| download | cachepc-linux-5198a48381455969aa1053a0ca2e4ce409be2fc2.tar.gz cachepc-linux-5198a48381455969aa1053a0ca2e4ce409be2fc2.zip | |
Merge branch 'psy-fixes' into psy-next
Signed-off-by: Sebastian Reichel <sre@kernel.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/power_supply.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h index b21c4bd96b84..f80769175c56 100644 --- a/include/linux/power_supply.h +++ b/include/linux/power_supply.h @@ -269,6 +269,7 @@ struct power_supply { spinlock_t changed_lock; bool changed; bool initialized; + bool removing; atomic_t use_cnt; #ifdef CONFIG_THERMAL struct thermal_zone_device *tzd; |