summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-09-01 13:50:20 +0100
committerMark Brown <broonie@linaro.org>2013-09-01 13:50:20 +0100
commita89f5c759857b1d1a56a4d530ad30bc1cacc58c9 (patch)
tree8bf3973a36ad031894db5ee68866dcd6916c0bc3 /include
parent09f2dd88ff93a6d31e10dd5c25e2aa2a8b7b12ee (diff)
parent5b175952011adae30b531ab89cc24acb173b2ce4 (diff)
downloadlinux-stable-a89f5c759857b1d1a56a4d530ad30bc1cacc58c9.tar.gz
linux-stable-a89f5c759857b1d1a56a4d530ad30bc1cacc58c9.tar.bz2
linux-stable-a89f5c759857b1d1a56a4d530ad30bc1cacc58c9.zip
Merge remote-tracking branch 'regulator/topic/ramp' into regulator-next
Diffstat (limited to 'include')
-rw-r--r--include/linux/regulator/machine.h1
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 */
};
/**