diff options
| author | Mark Brown <broonie@kernel.org> | 2016-01-05 19:07:16 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-01-05 19:07:16 +0000 |
| commit | 8798975bb645c0a0927b6f5f4a5964607ef932c1 (patch) | |
| tree | dc323f62c7078685f691bccaea3575235e5a3713 /include/linux/regmap.h | |
| parent | 6cca67129d526505567696813e2625b1caaa7abd (diff) | |
| parent | fcac0233d89ddce72945f3e0afaf4680572d8525 (diff) | |
Merge remote-tracking branch 'regmap/topic/core' into regmap-next
Diffstat (limited to 'include/linux/regmap.h')
| -rw-r--r-- | include/linux/regmap.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/regmap.h b/include/linux/regmap.h index d68bb402120e..4d9a1a04647b 100644 --- a/include/linux/regmap.h +++ b/include/linux/regmap.h @@ -1021,7 +1021,7 @@ static inline void regmap_async_complete(struct regmap *map) } static inline int regmap_register_patch(struct regmap *map, - const struct reg_default *regs, + const struct reg_sequence *regs, int num_regs) { WARN_ONCE(1, "regmap API is disabled"); |