diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-16 18:23:48 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-16 18:23:48 -0700 |
| commit | d6530016ed9a2457be89dfeed02714dfa52d46b1 (patch) | |
| tree | 06feab1ec251be7c5f6d4dd920e365bf22748ae1 /include | |
| parent | 0968d01827dfcd443d293c382b47d75fbf60832f (diff) | |
| parent | 9394b80c35760d13492a3a895add2891bc64bf86 (diff) | |
Merge branch 'depends/tps6589x-dt' into next/cleanup
Pull in a dependent branch from Mark Brown's regulator tree for the tegra/cleanup branch.
* depends/tps6589x-dt:
regulator: tps6586x: add support for SYS rail
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mfd/tps6586x.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/mfd/tps6586x.h b/include/linux/mfd/tps6586x.h index f350fd0ba1df..94514710a03f 100644 --- a/include/linux/mfd/tps6586x.h +++ b/include/linux/mfd/tps6586x.h @@ -14,6 +14,7 @@ #define TPS6586X_SLEW_RATE_MASK 0x07 enum { + TPS6586X_ID_SYS, TPS6586X_ID_SM_0, TPS6586X_ID_SM_1, TPS6586X_ID_SM_2, |