diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-03-18 17:38:20 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-03-18 17:38:20 -0400 |
| commit | c592c761a36286ab83451daa37a21c8558ea99c0 (patch) | |
| tree | 8abf57708fabf2a915320e9515b1ae2730ebf499 /include/linux/regulator | |
| parent | 63236f4038f7e14762114606d95769c32cf6cac1 (diff) | |
| parent | 33499df88b711725ee473ab5478e17efd21de4b0 (diff) | |
Merge remote-tracking branch 'regulator/topic/stub' into regulator-next
Diffstat (limited to 'include/linux/regulator')
| -rw-r--r-- | include/linux/regulator/fixed.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/include/linux/regulator/fixed.h b/include/linux/regulator/fixed.h index ffd7d508e726..936a7d8c11a9 100644 --- a/include/linux/regulator/fixed.h +++ b/include/linux/regulator/fixed.h | |||
| @@ -48,4 +48,17 @@ struct fixed_voltage_config { | |||
| 48 | struct regulator_init_data *init_data; | 48 | struct regulator_init_data *init_data; |
| 49 | }; | 49 | }; |
| 50 | 50 | ||
| 51 | struct regulator_consumer_supply; | ||
| 52 | |||
| 53 | #if IS_ENABLED(CONFIG_REGULATOR) | ||
| 54 | struct platform_device *regulator_register_fixed(int id, | ||
| 55 | struct regulator_consumer_supply *supplies, int num_supplies); | ||
| 56 | #else | ||
| 57 | static inline struct platform_device *regulator_register_fixed(int id, | ||
| 58 | struct regulator_consumer_supply *supplies, int num_supplies) | ||
| 59 | { | ||
| 60 | return NULL; | ||
| 61 | } | ||
| 62 | #endif | ||
| 63 | |||
| 51 | #endif | 64 | #endif |