diff options
| author | Sebastian Reichel <[email protected]> | 2024-09-03 23:33:25 +0200 |
|---|---|---|
| committer | Sebastian Reichel <[email protected]> | 2024-09-03 23:33:25 +0200 |
| commit | 2ff28e97658af64ae22878ee4dd8c0b583cd431c (patch) | |
| tree | 90df8d4e34a2cfdb5780db58613c675a791eb9e2 /include/linux | |
| parent | 47271a9356192bf911a9f32de9236425063ed6d7 (diff) | |
| parent | 364ea7ccaef917a3068236a19a4b31a0623b561a (diff) | |
Merge tag 'ib-psy-usb-types-signed' into psy-next
Changing usb_types type from array to bitmap in the power_supply_desc
struct requires updating power-supply drivers living in different
subsystem, so it is handled via an immutable branch.
Signed-off-by: Sebastian Reichel <[email protected]>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/power_supply.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h index 72dc7e45c90c..910d407ebe63 100644 --- a/include/linux/power_supply.h +++ b/include/linux/power_supply.h @@ -243,8 +243,7 @@ struct power_supply_desc { const char *name; enum power_supply_type type; u8 charge_behaviours; - const enum power_supply_usb_type *usb_types; - size_t num_usb_types; + u32 usb_types; const enum power_supply_property *properties; size_t num_properties; |