diff options
| author | Shreyas Narayan <shrena@codeaurora.org> | 2021-01-11 13:48:33 +0530 |
|---|---|---|
| committer | Shreyas Narayan <shrena@codeaurora.org> | 2021-01-11 13:49:13 +0530 |
| commit | 9ad7003fa045e91bebf116a715497e74f11351e4 (patch) | |
| tree | 340c551d461e4e38d158828d733607ea413c9889 /include | |
| parent | 0427be586cf9a32339c8a851a1802f7d897cfb06 (diff) | |
| parent | 8017a0d307e03f8a9d4ec192f7ea6e4699b0ee0e (diff) | |
Merge commit '8017a0d307e03f8a9d4ec192f7ea6e4699b0ee0e' into HEAD
Change-Id: Ia38cfc6b324139205e4ca8dd989c0dace8f0e540
Signed-off-by: Shreyas Narayan <shrena@codeaurora.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/hid.h | 2 | ||||
| -rw-r--r-- | include/linux/power_supply.h | 1 | ||||
| -rw-r--r-- | include/uapi/linux/if_link.h | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/hid.h b/include/linux/hid.h index 2a6dc0ab9b88..2f5435653459 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -529,10 +529,12 @@ struct hid_device { /* device report descriptor */ * battery is non-NULL. */ struct power_supply *battery; + __s32 battery_capacity; __s32 battery_min; __s32 battery_max; __s32 battery_report_type; __s32 battery_report_id; + bool battery_reported; #endif unsigned int status; /* see STAT flags above */ diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h index c3764d2a2934..6f87c722bb85 100644 --- a/include/linux/power_supply.h +++ b/include/linux/power_supply.h @@ -267,6 +267,7 @@ enum power_supply_property { POWER_SUPPLY_PROP_ENABLE_JEITA_DETECTION, POWER_SUPPLY_PROP_ALLOW_HVDCP3, POWER_SUPPLY_PROP_MAX_PULSE_ALLOWED, + POWER_SUPPLY_PROP_FG_RESET_CLOCK, /* Local extensions of type int64_t */ POWER_SUPPLY_PROP_CHARGE_COUNTER_EXT, /* Properties of type `const char *' */ diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h index 5ad57375a99f..7eb9178e3666 100644 --- a/include/uapi/linux/if_link.h +++ b/include/uapi/linux/if_link.h @@ -218,6 +218,7 @@ enum in6_addr_gen_mode { IN6_ADDR_GEN_MODE_EUI64, IN6_ADDR_GEN_MODE_NONE, IN6_ADDR_GEN_MODE_STABLE_PRIVACY, + IN6_ADDR_GEN_MODE_RANDOM, }; /* Bridge section */ |