Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

regulator: fix build when CONFIG_REGULATOR_DUMMY=n

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 <gadiyar@ti.com>
Cc: Liam Girdwood <lrg@slimlogic.co.uk>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>

authored by

Anand Gadiyar and committed by
Liam Girdwood
f5ee10ab 8cbf811d

-4
-4
drivers/regulator/dummy.h
··· 22 22 23 23 extern struct regulator_dev *dummy_regulator_rdev; 24 24 25 - #ifdef CONFIG_REGULATOR_DUMMY 26 25 void __init regulator_dummy_init(void); 27 - #else 28 - static inline void regulator_dummy_init(void) { } 29 - #endif 30 26 31 27 #endif