diff options
| author | Mark Brown <broonie@kernel.org> | 2018-12-21 13:43:30 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-12-21 13:43:30 +0000 |
| commit | 67a2ab931e9f79f516566e69c92e566b71fb20d1 (patch) | |
| tree | a10fbb7d47c28f420f68ed42ba3270157e21d1ff /include/linux | |
| parent | 7566ec393f4161572ba6f11ad5171fd5d59b0fbd (diff) | |
| parent | 2bb1666369339f69f227ad060c250afde94d5c69 (diff) | |
| download | linux-67a2ab931e9f79f516566e69c92e566b71fb20d1.tar.gz linux-67a2ab931e9f79f516566e69c92e566b71fb20d1.tar.bz2 linux-67a2ab931e9f79f516566e69c92e566b71fb20d1.zip | |
Merge branch 'regulator-4.20' into regulator-linus
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/regulator/consumer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h index 25602afd4844..f3f76051e8b0 100644 --- a/include/linux/regulator/consumer.h +++ b/include/linux/regulator/consumer.h @@ -508,7 +508,7 @@ static inline int regulator_get_error_flags(struct regulator *regulator, static inline int regulator_set_load(struct regulator *regulator, int load_uA) { - return REGULATOR_MODE_NORMAL; + return 0; } static inline int regulator_allow_bypass(struct regulator *regulator, |