summaryrefslogtreecommitdiff
path: root/include/linux/mfd/abx500.h
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@stericsson.com>2012-02-03 11:19:05 +0100
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-05-22 11:01:36 +0200
commit7d465f0f807deefcf396d0b61b938ac9893a3261 (patch)
tree55b64dbeef5f871cfeedbc8fb55c4094e498a347 /include/linux/mfd/abx500.h
parent3c2571945199c6f9080b815d58a107a5efab4bf5 (diff)
mfd/ab8500: remaining mainline differences
This collects the AB9540 changes that could not be included in the mainline patch set due to differences in the internal code (esp re GPIO driver). Signed-off-by: Linus Walleij <linus.walleij@stericsson.com> Change-Id: Ia5ed55f1f44da923e8b9ae22f9b47b681bbb8403 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/47743
Diffstat (limited to 'include/linux/mfd/abx500.h')
-rw-r--r--include/linux/mfd/abx500.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/mfd/abx500.h b/include/linux/mfd/abx500.h
index 2cf7f7b1823..1eb4c001471 100644
--- a/include/linux/mfd/abx500.h
+++ b/include/linux/mfd/abx500.h
@@ -33,6 +33,7 @@ struct device;
#define AB5500_1_0 0x20
#define AB5500_1_1 0x21
#define AB5500_2_0 0x24
+#define AB5500_2_1 0x25
/*
* AB3100, EVENTA1, A2 and A3 event register flags