Merge remote-tracking branch 'regulator/topic/optional' into regulator-next

This commit is contained in:
Mark Brown
2013-10-24 11:11:39 +01:00
3 changed files with 15 additions and 49 deletions

View File

@@ -195,15 +195,10 @@ int regulator_suspend_finish(void);
#ifdef CONFIG_REGULATOR
void regulator_has_full_constraints(void);
void regulator_use_dummy_regulator(void);
#else
static inline void regulator_has_full_constraints(void)
{
}
static inline void regulator_use_dummy_regulator(void)
{
}
#endif
#endif