diff options
| author | Mark Brown <broonie@kernel.org> | 2018-10-21 17:00:02 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-10-21 17:00:02 +0100 |
| commit | 4fd1f509e89f0e8ea28b1baa41d314636ae2064e (patch) | |
| tree | b9bb0e99bc91404e8d2709b8a5acdbefdab27bb2 /include/linux/regulator/fixed.h | |
| parent | 35a7f35ad1b150ddf59a41dcac7b2fa32982be0e (diff) | |
| parent | d8b2a8e9c06bc389659716e81d1c2b1f147611d1 (diff) | |
| download | linux-next-4fd1f509e89f0e8ea28b1baa41d314636ae2064e.tar.gz linux-next-4fd1f509e89f0e8ea28b1baa41d314636ae2064e.zip | |
Merge branch 'regulator-4.20' into regulator-next
Diffstat (limited to 'include/linux/regulator/fixed.h')
| -rw-r--r-- | include/linux/regulator/fixed.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/regulator/fixed.h b/include/linux/regulator/fixed.h index 48918be649d4..1a4340ed8e2b 100644 --- a/include/linux/regulator/fixed.h +++ b/include/linux/regulator/fixed.h @@ -24,8 +24,6 @@ struct regulator_init_data; * @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 * @startup_delay: Start-up time in microseconds * @gpio_is_open_drain: Gpio pin is open drain or normal type. * If it is open drain type then HIGH will be set @@ -49,7 +47,6 @@ struct fixed_voltage_config { const char *supply_name; const char *input_supply; int microvolts; - int gpio; unsigned startup_delay; unsigned gpio_is_open_drain:1; unsigned enable_high:1; |