On Wed, 03 Apr 2013, Axel Lin wrote: > Signed-off-by: Axel Lin <[email protected]> > --- > drivers/regulator/ab8500.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c > index 73d84d8..d3170ae 100644 > --- a/drivers/regulator/ab8500.c > +++ b/drivers/regulator/ab8500.c > @@ -3021,11 +3021,15 @@ static int ab8500_regulator_probe(struct > platform_device *pdev) > regulator_info_size = ARRAY_SIZE(ab8505_regulator_info); > reg_init = ab8505_reg_init; > reg_init_size = AB8505_NUM_REGULATOR_REGISTERS; > + match = ab8505_regulator_match; > + match_size = ARRAY_SIZE(ab8505_regulator_match); > } else if (is_ab8540(ab8500)) { > regulator_info = ab8540_regulator_info; > regulator_info_size = ARRAY_SIZE(ab8540_regulator_info); > reg_init = ab8540_reg_init; > reg_init_size = AB8540_NUM_REGULATOR_REGISTERS; > + match = ab8540_regulator_match; > + match_size = ARRAY_SIZE(ab8540_regulator_match); > } else { > regulator_info = ab8500_regulator_info; > regulator_info_size = ARRAY_SIZE(ab8500_regulator_info);
Hmm... looks like a merge error, sorry for that. Again is solved by the next patch in Mark's list: "regulator: ab8500: Use a struct to select the good regulator configuration" Ironically Mark this is No11. -- Lee Jones Linaro ST-Ericsson Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
