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 /drivers/regulator/dummy.h | |
| parent | a0e3390787ef523699ae1f3f3ea0ca953e630be2 (diff) | |
| parent | ec10b0e94ebe7de3b301d60e6f7f4a12d3d280c6 (diff) | |
| download | op-kernel-dev-9aca0e7c8c3a8f1fa6e3058abc5465b0509f0f8e.zip op-kernel-dev-9aca0e7c8c3a8f1fa6e3058abc5465b0509f0f8e.tar.gz | |
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 'drivers/regulator/dummy.h')
| -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 3921c0e..97a11b7 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 |
