summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2012-09-14 11:34:47 -0600
committerStephen Warren <swarren@nvidia.com>2012-09-14 11:34:47 -0600
commit1f10478cabacf55f87be5ed4440d07378f19c237 (patch)
tree7dc682d14ea3ebd261e48fccb14c8a759ee4dfb8 /include
parenta5b64ce64d6bdceecd45a07893affbf88d7bb7d2 (diff)
parentbe972c3272c354b323afcb7e9552a9b04e675a8b (diff)
downloadtalos-obmc-linux-1f10478cabacf55f87be5ed4440d07378f19c237.tar.gz
talos-obmc-linux-1f10478cabacf55f87be5ed4440d07378f19c237.zip
Merge branch 'for-3.7/board-removal' into for-3.7/cleanup2
Diffstat (limited to 'include')
-rw-r--r--include/linux/mfd/tps6586x.h1
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,
OpenPOWER on IntegriCloud