2009-07-09 14:44:49

by Mark Brown

Subject: [PATCH] regulator: Define full constraints function with REGULATOR disabled

This allows machine drivers to build without ifdefs if they have
full constraints. Suggested by machine drivers contributed by
Haojian Zhuang <[email protected]>.

Signed-off-by: Mark Brown <[email protected]>
---
include/linux/regulator/machine.h | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/include/linux/regulator/machine.h b/include/linux/regulator/machine.h
index 9328090..73a88f6 100644
--- a/include/linux/regulator/machine.h
+++ b/include/linux/regulator/machine.h
@@ -171,6 +171,12 @@ struct regulator_init_data {

int regulator_suspend_prepare(suspend_state_t state);

+#ifdef CONFIG_REGULATOR
void regulator_has_full_constraints(void);
+#else
+static inline void regulator_has_full_constraints(void)
+{
+}
+#endif

#endif
--
1.6.3.3

2009-07-10 16:00:50

by Liam Girdwood

Subject: Re: [PATCH] regulator: Define full constraints function with REGULATOR disabled

On Thu, 2009-07-09 at 15:44 +0100, Mark Brown wrote:
> This allows machine drivers to build without ifdefs if they have
> full constraints. Suggested by machine drivers contributed by
> Haojian Zhuang <[email protected]>.
>
> Signed-off-by: Mark Brown <[email protected]>
> ---
> include/linux/regulator/machine.h | 6 ++++++
> 1 files changed, 6 insertions(+), 0 deletions(-)
>

Applied.

Thanks

Liam