diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-14 12:11:07 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-14 12:11:07 -0500 |
| commit | 7798b582d31e92227ca457f93db320ad9654dada (patch) | |
| tree | 13ea398eb239df155bba350bdb0ba4db18df5dc3 /include/linux/regmap.h | |
| parent | 43280026c842c44a8505a1b909378e62f754ecfe (diff) | |
| parent | 2ac902ce17f9dfa0d4d1f0818be147b5d2515fb7 (diff) | |
Merge remote-tracking branch 'regmap/topic/flat' into regmap-next
Diffstat (limited to 'include/linux/regmap.h')
| -rw-r--r-- | include/linux/regmap.h | 3 |
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; | |||
| 28 | enum regcache_type { | 28 | enum regcache_type { |
| 29 | REGCACHE_NONE, | 29 | REGCACHE_NONE, |
| 30 | REGCACHE_RBTREE, | 30 | REGCACHE_RBTREE, |
| 31 | REGCACHE_COMPRESSED | 31 | REGCACHE_COMPRESSED, |
| 32 | REGCACHE_FLAT, | ||
| 32 | }; | 33 | }; |
| 33 | 34 | ||
| 34 | /** | 35 | /** |