diff options
author | Mark Brown <broonie@linaro.org> | 2014-06-02 20:08:14 +0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-06-02 20:08:14 +0400 |
commit | 978371cbabb4cb7a47751049d72f06dc8348cab2 (patch) | |
tree | fcd37ce42f4eb934fcd455c2857630cb9b2d4bf0 /include | |
parent | b58e917bf9eadf1efbbebe49f13235c56f0c2c4f (diff) | |
parent | ae8b70c9d8ff3c2120651c880a148596061dcbb2 (diff) | |
download | linux-978371cbabb4cb7a47751049d72f06dc8348cab2.tar.xz |
Merge remote-tracking branch 'regulator/topic/tps6586x' into regulator-next
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/mfd/tps6586x.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/mfd/tps6586x.h b/include/linux/mfd/tps6586x.h index cbecec2e353a..96187ed9f9bb 100644 --- a/include/linux/mfd/tps6586x.h +++ b/include/linux/mfd/tps6586x.h @@ -17,6 +17,8 @@ #define TPS658621A 0x15 #define TPS658621CD 0x2c #define TPS658623 0x1b +#define TPS658640 0x01 +#define TPS658640v2 0x02 #define TPS658643 0x03 enum { |