aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2020-01-15 14:12:12 +0000
committerMark Brown <broonie@kernel.org>2020-01-15 14:12:12 +0000
commitdf4e3eee310fb66e5f17aa651183b94d0d152650 (patch)
treed64b36f2d360ec9b9a3551e2b92f5c26be778294
parentASoC: sgtl5000: add multi endpoint support (diff)
parentregulator fix for "regulator: core: Add regulator_is_equal() helper" (diff)
downloadlinux-dev-df4e3eee310fb66e5f17aa651183b94d0d152650.tar.xz
linux-dev-df4e3eee310fb66e5f17aa651183b94d0d152650.zip
Merge branch 'topic/equal' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into asoc-5.6
-rw-r--r--include/linux/regulator/consumer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h
index 2c89d886595c..6a92fd3105a3 100644
--- a/include/linux/regulator/consumer.h
+++ b/include/linux/regulator/consumer.h
@@ -596,7 +596,7 @@ regulator_bulk_set_supply_names(struct regulator_bulk_data *consumers,
}
static inline bool
-regulator_is_equal(struct regulator *reg1, struct regulator *reg2);
+regulator_is_equal(struct regulator *reg1, struct regulator *reg2)
{
return false;
}