diff options
| author | Mark Brown <broonie@kernel.org> | 2016-05-13 05:36:09 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-05-13 05:36:09 -0400 |
| commit | 066a0e0b49afe9531f0e464a1ef05b24d0c95986 (patch) | |
| tree | 8936ded0d361b372e730ba9475c71b6ae51e5364 /drivers/base | |
| parent | 44549e8f5eea4e0a41b487b63e616cb089922b99 (diff) | |
| parent | 2ed94f6fde066fb37bc3553b786edb805561699e (diff) | |
Merge remote-tracking branch 'regmap/fix/mmio' into regmap-linus
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/regmap/regmap-mmio.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/base/regmap/regmap-mmio.c b/drivers/base/regmap/regmap-mmio.c index 7526906ca080..1aa26aa31f6a 100644 --- a/drivers/base/regmap/regmap-mmio.c +++ b/drivers/base/regmap/regmap-mmio.c | |||
| @@ -212,6 +212,7 @@ static const struct regmap_bus regmap_mmio = { | |||
| 212 | .reg_write = regmap_mmio_write, | 212 | .reg_write = regmap_mmio_write, |
| 213 | .reg_read = regmap_mmio_read, | 213 | .reg_read = regmap_mmio_read, |
| 214 | .free_context = regmap_mmio_free_context, | 214 | .free_context = regmap_mmio_free_context, |
| 215 | .val_format_endian_default = REGMAP_ENDIAN_LITTLE, | ||
| 215 | }; | 216 | }; |
| 216 | 217 | ||
| 217 | static struct regmap_mmio_context *regmap_mmio_gen_context(struct device *dev, | 218 | static struct regmap_mmio_context *regmap_mmio_gen_context(struct device *dev, |