On Mon, 11 Oct 2010 22:05:55 +0530 Anand Gadiyar wrote: > Commit f03f91826 (regulator: Add option for machine drivers > to enable the dummy regulator) in the regulators tree > seems to have introduced the following build break when > CONFIG_REGULATOR_DUMMY is disabled. Fix this. > > CC drivers/regulator/dummy.o > drivers/regulator/dummy.c:41: error: redefinition of 'regulator_dummy_init' > drivers/regulator/dummy.h:28: note: previous definition of > 'regulator_dummy_init' was here > make[2]: *** [drivers/regulator/dummy.o] Error 1 > make[1]: *** [drivers/regulator] Error 2 > make: *** [drivers] Error 2 > > Signed-off-by: Anand Gadiyar <[email protected]> > Cc: Liam Girdwood <[email protected]> > Cc: Mark Brown <[email protected]> > --- > The commit referenced above is in linux next as of 20101011 > and breaks builds of the omap2plus_defconfig at least. > > drivers/regulator/dummy.h | 4 ---- > 1 file changed, 4 deletions(-) > > Index: mainline/drivers/regulator/dummy.h > =================================================================== > --- mainline.orig/drivers/regulator/dummy.h > +++ mainline/drivers/regulator/dummy.h > @@ -22,10 +22,6 @@ struct regulator_dev; > > extern struct regulator_dev *dummy_regulator_rdev; > > -#ifdef CONFIG_REGULATOR_DUMMY > void __init regulator_dummy_init(void); > -#else > -static inline void regulator_dummy_init(void) { } > -#endif > > #endif > --
Acked-by: Randy Dunlap <[email protected]> Thanks. --- ~Randy *** Remember to use Documentation/SubmitChecklist when testing your code *** -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
