diff options
| author | Greg Kroah-Hartman | 2015-02-02 18:10:17 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2015-02-02 18:10:17 +0100 |
| commit | b3a54bf9ed76dff9dd26e1fc719431fb14604a8a (patch) | |
| tree | 38d2b3f00c71a881f303a06dfe361c9d6d591014 /include/linux/mfd | |
| parent | USB: fix use-after-free bug in usb_hcd_unlink_urb() (diff) | |
| parent | Linux 3.19-rc7 (diff) | |
| download | kernel-qcow2-linux-b3a54bf9ed76dff9dd26e1fc719431fb14604a8a.tar.gz kernel-qcow2-linux-b3a54bf9ed76dff9dd26e1fc719431fb14604a8a.tar.xz kernel-qcow2-linux-b3a54bf9ed76dff9dd26e1fc719431fb14604a8a.zip | |
Merge 3.19-rc7 into usb-next
We want the USB fixes in here to make merges easier.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/mfd')
| -rw-r--r-- | include/linux/mfd/samsung/s2mps13.h | 2 |
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, |