summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-02-14 17:11:07 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-02-14 17:11:07 +0000
commit7798b582d31e92227ca457f93db320ad9654dada (patch)
tree13ea398eb239df155bba350bdb0ba4db18df5dc3 /include
parent43280026c842c44a8505a1b909378e62f754ecfe (diff)
parent2ac902ce17f9dfa0d4d1f0818be147b5d2515fb7 (diff)
downloadlinux-7798b582d31e92227ca457f93db320ad9654dada.tar.gz
linux-7798b582d31e92227ca457f93db320ad9654dada.tar.bz2
linux-7798b582d31e92227ca457f93db320ad9654dada.zip
Merge remote-tracking branch 'regmap/topic/flat' into regmap-next
Diffstat (limited to 'include')
-rw-r--r--include/linux/regmap.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/regmap.h b/include/linux/regmap.h
index f9b7fbe35ab1..7e2a48e25bd4 100644
--- a/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@ -28,7 +28,8 @@ struct regmap_range_cfg;
enum regcache_type {
REGCACHE_NONE,
REGCACHE_RBTREE,
- REGCACHE_COMPRESSED
+ REGCACHE_COMPRESSED,
+ REGCACHE_FLAT,
};
/**