Merge remote-tracking branch 'regulator/topic/equal' into regulator-next

This commit is contained in:
Mark Brown 2020-01-23 12:37:08 +00:00
commit ebe0bdf9cf
No known key found for this signature in database
GPG key ID: 24D68B725D5487D0
2 changed files with 21 additions and 0 deletions

View file

@ -287,6 +287,8 @@ void regulator_bulk_set_supply_names(struct regulator_bulk_data *consumers,
const char *const *supply_names,
unsigned int num_supplies);
bool regulator_is_equal(struct regulator *reg1, struct regulator *reg2);
#else
/*
@ -593,6 +595,11 @@ regulator_bulk_set_supply_names(struct regulator_bulk_data *consumers,
{
}
static inline bool
regulator_is_equal(struct regulator *reg1, struct regulator *reg2)
{
return false;
}
#endif
static inline int regulator_set_voltage_triplet(struct regulator *regulator,