History

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

Mark Brown committed 6 years ago

Commit ebe0bdf2 parents 9909f79 0468e662 files · +21 −0Browse files

Showing the changes to include/linux (1 of 2 files). Show all

Unified · Split

include/linux/regulator/consumer.h+7−0
@@ -287,6 +287,8 @@ void regulator_bulk_set_supply_names(struct regulator_bulk_data *consumers, · 286 unmodified lines
287 const char *const *supply_names,287 const char *const *supply_names,
288 unsigned int num_supplies);288 unsigned int num_supplies);
289 289
290bool regulator_is_equal(struct regulator *reg1, struct regulator *reg2);
291
290#else292#else
291 293
292/*294/*
@@ -593,6 +595,11 @@ regulator_bulk_set_supply_names(struct regulator_bulk_data *consumers, · 300 unmodified lines
593{595{
594}596}
595 597
598static inline bool
599regulator_is_equal(struct regulator *reg1, struct regulator *reg2)
600{
601 return false;
602}
596#endif603#endif
597 604
598static inline int regulator_set_voltage_triplet(struct regulator *regulator,605static inline int regulator_set_voltage_triplet(struct regulator *regulator,