diff options
| author |   Mark Brown <broonie@linaro.org> | 2014-06-02 17:08:14 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-06-02 17:08:14 +0100 |
| commit | 978371cbabb4cb7a47751049d72f06dc8348cab2 (patch) | |
| tree | fcd37ce42f4eb934fcd455c2857630cb9b2d4bf0 /include | |
| parent | Merge remote-tracking branches 'regulator/topic/s5m8767', 'regulator/topic/stub', 'regulator/topic/tps65090', 'regulator/topic/tps65217' and 'regulator/topic/tps65218' into regulator-next (diff) | |
| parent | regulator: tps6586x: Remove unused to_tps6586x_dev() function (diff) | |
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 { |