diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-22 19:32:00 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-22 19:32:00 +0100 |
| commit | 3384fb98845dc014770caa224d61a2effd258ca5 (patch) | |
| tree | 8189134a4938632e2d06e93af04c9fc1f3c2d4c9 /include/linux/regulator/fixed.h | |
| parent | 8cfc545e0e3e6cc82acfdc79321b41eeeab0ca45 (diff) | |
| parent | ade7515fefad9af13f6dd469f35bb413b6a5b473 (diff) | |
| download | op-kernel-dev-3384fb98845dc014770caa224d61a2effd258ca5.zip op-kernel-dev-3384fb98845dc014770caa224d61a2effd258ca5.tar.gz | |
Merge branch 'regulator-drivers' into regulator-next
Diffstat (limited to 'include/linux/regulator/fixed.h')
| -rw-r--r-- | include/linux/regulator/fixed.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/regulator/fixed.h b/include/linux/regulator/fixed.h index 680f24e..48918be 100644 --- a/include/linux/regulator/fixed.h +++ b/include/linux/regulator/fixed.h @@ -22,6 +22,7 @@ struct regulator_init_data; /** * struct fixed_voltage_config - fixed_voltage_config structure * @supply_name: Name of the regulator supply + * @input_supply: Name of the input regulator supply * @microvolts: Output voltage of regulator * @gpio: GPIO to use for enable control * set to -EINVAL if not used @@ -46,6 +47,7 @@ struct regulator_init_data; */ struct fixed_voltage_config { const char *supply_name; + const char *input_supply; int microvolts; int gpio; unsigned startup_delay; |
