diff options
| author | Chanwoo Choi <cw00.choi@samsung.com> | 2024-09-05 00:45:23 +0900 |
|---|---|---|
| committer | Chanwoo Choi <cw00.choi@samsung.com> | 2024-09-05 00:45:23 +0900 |
| commit | c135cd82f194eed0328e2c1942892990b7fb0dc1 (patch) | |
| tree | cf51aa3de74f282525036a8258b33e67c617eb1a /include/linux | |
| parent | 79a31ce03f416cc2b9374b3838c60985bc2cb443 (diff) | |
| parent | 364ea7ccaef917a3068236a19a4b31a0623b561a (diff) | |
| download | linux-c135cd82f194eed0328e2c1942892990b7fb0dc1.tar.gz linux-c135cd82f194eed0328e2c1942892990b7fb0dc1.tar.bz2 linux-c135cd82f194eed0328e2c1942892990b7fb0dc1.zip | |
Merge tag 'ib-psy-usb-types-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply into extcon-next
Immutable branch for usb_types change for v6.12
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.
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; |