From: Mark Brown Date: Thu, 14 Feb 2013 17:11:07 +0000 (+0000) Subject: Merge remote-tracking branch 'regmap/topic/flat' into regmap-next X-Git-Tag: MMI-PSA29.97-13-9~14864^2~4 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7798b582d31e92227ca457f93db320ad9654dada;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Merge remote-tracking branch 'regmap/topic/flat' into regmap-next --- 7798b582d31e92227ca457f93db320ad9654dada diff --cc drivers/base/regmap/internal.h index 2cad787fa548,e22bb80edff1..70ca270b77e2 --- a/drivers/base/regmap/internal.h +++ b/drivers/base/regmap/internal.h @@@ -192,9 -175,8 +192,10 @@@ bool regcache_set_val(void *base, unsig unsigned int val, unsigned int word_size); int regcache_lookup_reg(struct regmap *map, unsigned int reg); +void regmap_async_complete_cb(struct regmap_async *async, int ret); + extern struct regcache_ops regcache_rbtree_ops; extern struct regcache_ops regcache_lzo_ops; + extern struct regcache_ops regcache_flat_ops; #endif