diff options
| author | Mark Brown <broonie@linaro.org> | 2013-07-15 18:31:04 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-07-15 18:31:04 +0100 |
| commit | 92d8ecae7eda0820663933e568915dbf7ef79127 (patch) | |
| tree | f602547b7f5aa63ef9fadbd791ad06810fdb9db8 /include/linux | |
| parent | 1e1598ed04d831f5bb42a197b4045e6780365217 (diff) | |
| parent | 5b175952011adae30b531ab89cc24acb173b2ce4 (diff) | |
Merge branch 'topic/ramp' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-sec
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/regulator/machine.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/regulator/machine.h b/include/linux/regulator/machine.h index 36adbc82de6a..999b20ce06cf 100644 --- a/include/linux/regulator/machine.h +++ b/include/linux/regulator/machine.h @@ -134,6 +134,7 @@ struct regulation_constraints { unsigned always_on:1; /* regulator never off when system is on */ unsigned boot_on:1; /* bootloader/firmware enabled regulator */ unsigned apply_uV:1; /* apply uV constraint if min == max */ + unsigned ramp_disable:1; /* disable ramp delay */ }; /** |