Merge 705c1da8fa ("Merge tag 'pci-v6.9-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci") into android-mainline
Steps on the way to v6.9-rc1 Signed-off-by: Lee Jones <joneslee@google.com> Change-Id: I5250ff156347d99a93a5212f18f90bc5bf3d95f6
This commit is contained in:
@@ -248,6 +248,7 @@ struct power_supply_config {
|
||||
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;
|
||||
const enum power_supply_property *properties;
|
||||
@@ -910,8 +911,7 @@ extern int power_supply_powers(struct power_supply *psy, struct device *dev);
|
||||
#define to_power_supply(device) container_of(device, struct power_supply, dev)
|
||||
|
||||
extern void *power_supply_get_drvdata(struct power_supply *psy);
|
||||
/* For APM emulation, think legacy userspace. */
|
||||
extern struct class *power_supply_class;
|
||||
extern int power_supply_for_each_device(void *data, int (*fn)(struct device *dev, void *data));
|
||||
|
||||
static inline bool power_supply_is_amp_property(enum power_supply_property psp)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user