diff options
| author | Anand Gadiyar <gadiyar@ti.com> | 2010-10-11 22:05:55 +0530 |
|---|---|---|
| committer | Liam Girdwood <lrg@slimlogic.co.uk> | 2010-10-28 22:40:32 +0100 |
| commit | f5ee10ab42c76f36eea1bd6f7a35da387635ebf9 (patch) | |
| tree | aa32fc02074bac88f888fb0959ef7c39e20da0be /drivers/regulator | |
| parent | 8cbf811dfd027bde8504e541d0009c5722b98be5 (diff) | |
| download | linux-f5ee10ab42c76f36eea1bd6f7a35da387635ebf9.tar.gz | |
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>
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/dummy.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/regulator/dummy.h b/drivers/regulator/dummy.h index 3921c0e24249..97a11b7e8882 100644 --- a/drivers/regulator/dummy.h +++ b/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 |