summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-03-05 06:12:39 +0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-03-05 06:12:39 +0400
commit6d62768468d5ff96b3977a04045dd80d6710be5d (patch)
treef2429b5502c9f76650189939c824a95d2544e654 /include
parent521e2e03b8f6c92910b72fd464126596242398f8 (diff)
parent9345dfb8495aa17ce7c575e1a96e5ad64def0b3d (diff)
downloadlinux-6d62768468d5ff96b3977a04045dd80d6710be5d.tar.xz
Merge remote-tracking branch 'regulator/fix/doc' into tmp
Diffstat (limited to 'include')
-rw-r--r--include/linux/regulator/driver.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h
index 23070fd83872..7df93f52db08 100644
--- a/include/linux/regulator/driver.h
+++ b/include/linux/regulator/driver.h
@@ -199,6 +199,8 @@ enum regulator_type {
* output when using regulator_set_voltage_sel_regmap
* @enable_reg: Register for control when using regmap enable/disable ops
* @enable_mask: Mask for control when using regmap enable/disable ops
+ * @bypass_reg: Register for control when using regmap set_bypass
+ * @bypass_mask: Mask for control when using regmap set_bypass
*
* @enable_time: Time taken for initial enable of regulator (in uS).
*/