On Sun, Dec 4, 2016 at 11:52 PM, David Lechner <da...@lechnology.com> wrote: > The function signature of does not match regulator_get_error_flags() > when CONFIG_REGULATOR is not defined vs. when it is not defined. > This makes both declarations match to prevent compiler errors. > > Signed-off-by: David Lechner <da...@lechnology.com> > --- > include/linux/regulator/consumer.h | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/include/linux/regulator/consumer.h > b/include/linux/regulator/consumer.h > index 528eb1f..ea0fffa 100644 > --- a/include/linux/regulator/consumer.h > +++ b/include/linux/regulator/consumer.h > @@ -498,7 +498,8 @@ static inline unsigned int regulator_get_mode(struct > regulator *regulator) > return REGULATOR_MODE_NORMAL; > } > > -static inline int regulator_get_error_flags(struct regulator *regulator) > +static inline int regulator_get_error_flags(struct regulator *regulator, > + unsigned int *flags) > { > return -EINVAL;
ouch, i missed this change when i modified the patch, sorry, and thanks for fixing it David, Regards, -Axel. > } > -- > 2.7.4 >