diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-28 15:13:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-28 15:13:24 -0700 |
| commit | 9aca0e7c8c3a8f1fa6e3058abc5465b0509f0f8e (patch) | |
| tree | a905000d066defcc187e8e073134a1bee3c56fc1 /include/linux/regulator/machine.h | |
| parent | Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 (diff) | |
| parent | regulator: max8952 - fix max8952_set_voltage (diff) | |
| download | linux-dev-9aca0e7c8c3a8f1fa6e3058abc5465b0509f0f8e.tar.xz linux-dev-9aca0e7c8c3a8f1fa6e3058abc5465b0509f0f8e.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6:
regulator: max8952 - fix max8952_set_voltage
regulator: max8952 - fix max8952_pmic_probe error path
regulator: fix build when CONFIG_REGULATOR_DUMMY=n
regulator: avoid deadlock when disabling regulator with supply
regulator: Add option for machine drivers to enable the dummy regulator
Regulator: lp3972 cleanup
Regulator: LP3972 PMIC regulator driver
MAX8952 PMIC Driver Initial Release
Diffstat (limited to 'include/linux/regulator/machine.h')
| -rw-r--r-- | include/linux/regulator/machine.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/regulator/machine.h b/include/linux/regulator/machine.h index e2980287245e..761c745b9c24 100644 --- a/include/linux/regulator/machine.h +++ b/include/linux/regulator/machine.h @@ -189,10 +189,15 @@ int regulator_suspend_prepare(suspend_state_t state); #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 |