summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-01-16 12:05:35 +0000
committerMark Brown <broonie@kernel.org>2015-01-16 12:05:35 +0000
commit113620bb89a580d72a1dd78e677c0c8aac45cf0c (patch)
treea791f5e2e8775b25f8c1e6e347463acfda032f3a /include
parentd56133793a79153b7d8144d09ddeec17554ce190 (diff)
parentad26aa6c60974acf3228ed0ade97ba5793093dbe (diff)
Merge remote-tracking branch 'regulator/fix/s2mps11' into regulator-linus
Diffstat (limited to 'include')
-rw-r--r--include/linux/mfd/samsung/s2mps13.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/mfd/samsung/s2mps13.h b/include/linux/mfd/samsung/s2mps13.h
index ce5dda8958fe..b1fd675fa36f 100644
--- a/include/linux/mfd/samsung/s2mps13.h
+++ b/include/linux/mfd/samsung/s2mps13.h
@@ -59,6 +59,7 @@ enum s2mps13_reg {
S2MPS13_REG_B6CTRL,
S2MPS13_REG_B6OUT,
S2MPS13_REG_B7CTRL,
+ S2MPS13_REG_B7SW,
S2MPS13_REG_B7OUT,
S2MPS13_REG_B8CTRL,
S2MPS13_REG_B8OUT,
@@ -102,6 +103,7 @@ enum s2mps13_reg {
S2MPS13_REG_L26CTRL,
S2MPS13_REG_L27CTRL,
S2MPS13_REG_L28CTRL,
+ S2MPS13_REG_L29CTRL,
S2MPS13_REG_L30CTRL,
S2MPS13_REG_L31CTRL,
S2MPS13_REG_L32CTRL,