diff options
| author | Mark Brown | 2012-03-14 14:13:25 +0100 |
|---|---|---|
| committer | Mark Brown | 2012-03-14 14:13:25 +0100 |
| commit | 7d9aca39dcacd2b3f42e2e287162329f410f93e1 (patch) | |
| tree | 2907b680b2b7625226f46d23d74ccc9c58ad0362 /include/linux/regmap.h | |
| parent | Merge remote-tracking branches 'regmap/topic/core' and 'regmap/topic/devm' in... (diff) | |
| parent | mfd: Improve performance of later WM1811 revisions (diff) | |
| download | kernel-qcow2-linux-7d9aca39dcacd2b3f42e2e287162329f410f93e1.tar.gz kernel-qcow2-linux-7d9aca39dcacd2b3f42e2e287162329f410f93e1.tar.xz kernel-qcow2-linux-7d9aca39dcacd2b3f42e2e287162329f410f93e1.zip | |
Merge remote-tracking branch 'regmap/topic/drivers' into regmap-next
Resolved simple add/add conflicts:
drivers/base/regmap/internal.h
drivers/base/regmap/regmap.c
Diffstat (limited to 'include/linux/regmap.h')
| -rw-r--r-- | include/linux/regmap.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/regmap.h b/include/linux/regmap.h index 5b0908a7f5bf..56ca477d5098 100644 --- a/include/linux/regmap.h +++ b/include/linux/regmap.h @@ -162,6 +162,9 @@ void regcache_cache_only(struct regmap *map, bool enable); void regcache_cache_bypass(struct regmap *map, bool enable); void regcache_mark_dirty(struct regmap *map); +int regmap_register_patch(struct regmap *map, const struct reg_default *regs, + int num_regs); + /** * Description of an IRQ for the generic regmap irq_chip. * |