aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-02-20 16:21:33 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-02-20 16:21:33 -0500
commitaca1e172a1096ed3785e0da01d82943b7562527c (patch)
tree0826c140b4e31acd7f8546727498dd849f099ba6 /include/linux
parent3bf06a1ad9b147ca3a64b119d70c4a7c0ace3695 (diff)
parent2a14d7d9b7439fe62082a60a7f8983ccb463d134 (diff)
Merge branch 'topic/patch' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap into regmap-drivers
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/regmap.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/regmap.h b/include/linux/regmap.h
index 195db51ec79b..4a957fdb46f1 100644
--- a/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@ -157,6 +157,9 @@ void regcache_cache_only(struct regmap *map, bool enable);
157void regcache_cache_bypass(struct regmap *map, bool enable); 157void regcache_cache_bypass(struct regmap *map, bool enable);
158void regcache_mark_dirty(struct regmap *map); 158void regcache_mark_dirty(struct regmap *map);
159 159
160int regmap_register_patch(struct regmap *map, const struct reg_default *regs,
161 int num_regs);
162
160/** 163/**
161 * Description of an IRQ for the generic regmap irq_chip. 164 * Description of an IRQ for the generic regmap irq_chip.
162 * 165 *