diff options
| author | Krzysztof Kozlowski <k.kozlowski@samsung.com> | 2015-02-04 05:45:28 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-02-04 06:22:21 -0500 |
| commit | 509102760da3a21831e763560ba4715760e3fbda (patch) | |
| tree | dfe1cf4441c8a2518f6aaab305289b775ecf54ae /include/linux/regulator | |
| parent | 83b0302d347a49f951e904184afe57ac3723476e (diff) | |
regulator: Fix build breakage on !REGULATOR
Add missing stubs for regulator_suspend_prepare() and
regulator_suspend_finish() to fix exynos_defconfig build without
REGULATOR:
arch/arm/mach-exynos/built-in.o: In function `exynos_suspend_finish':
arch/arm/mach-exynos/suspend.c:537: undefined reference to `regulator_suspend_finish'
arch/arm/mach-exynos/built-in.o: In function `exynos_suspend_prepare':
arch/arm/mach-exynos/suspend.c:520: undefined reference to `regulator_suspend_prepare'
make: *** [vmlinux] Error 1
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Reported-by: Joerg Roedel <joro@8bytes.org>
Reported-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'include/linux/regulator')
| -rw-r--r-- | include/linux/regulator/machine.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/include/linux/regulator/machine.h b/include/linux/regulator/machine.h index 0b08d05d470b..b07562e082c4 100644 --- a/include/linux/regulator/machine.h +++ b/include/linux/regulator/machine.h | |||
| @@ -191,15 +191,22 @@ struct regulator_init_data { | |||
| 191 | void *driver_data; /* core does not touch this */ | 191 | void *driver_data; /* core does not touch this */ |
| 192 | }; | 192 | }; |
| 193 | 193 | ||
| 194 | int regulator_suspend_prepare(suspend_state_t state); | ||
| 195 | int regulator_suspend_finish(void); | ||
| 196 | |||
| 197 | #ifdef CONFIG_REGULATOR | 194 | #ifdef CONFIG_REGULATOR |
| 198 | void regulator_has_full_constraints(void); | 195 | void regulator_has_full_constraints(void); |
| 196 | int regulator_suspend_prepare(suspend_state_t state); | ||
| 197 | int regulator_suspend_finish(void); | ||
| 199 | #else | 198 | #else |
| 200 | static inline void regulator_has_full_constraints(void) | 199 | static inline void regulator_has_full_constraints(void) |
| 201 | { | 200 | { |
| 202 | } | 201 | } |
| 202 | static inline int regulator_suspend_prepare(suspend_state_t state) | ||
| 203 | { | ||
| 204 | return 0; | ||
| 205 | } | ||
| 206 | static inline int regulator_suspend_finish(void) | ||
| 207 | { | ||
| 208 | return 0; | ||
| 209 | } | ||
| 203 | #endif | 210 | #endif |
| 204 | 211 | ||
| 205 | #endif | 212 | #endif |
