diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-09 12:52:18 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-09 12:52:18 -0800 |
| commit | f381f906955a2b0619b5557cc53aafcc7ef27be8 (patch) | |
| tree | 7d118f321be3cae3eb45cfc169038e877379a870 /include | |
| parent | 5c30c3cc6d5de71f1248875e9213e6c109dda963 (diff) | |
| parent | 1aff0310ebdd42fa0045440cee19c5a8cfecf70c (diff) | |
Merge tag 'regmap-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap
Pull regmap updates from Mark Brown:
"A very quiet release for regmap this time around:
- Fix an endianness issue for I2C devices connected via SMBus where
we were getting two layers both trying to do endianness handling.
- Use a union to reduce the size of the regmap struct.
- A couple of smaller fixes"
* tag 'regmap-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
regmap: Fix i2c word access when using SMBus access functions
regmap: Export regmap_get_val_endian
regmap: ac97: Clean up indentation
regmap: correct the description of structure element in reg_field
regmap: Move spinlock_flags into the union
Diffstat (limited to 'include')
| -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 4419b99d8d6e..116655d92269 100644 --- a/include/linux/regmap.h +++ b/include/linux/regmap.h @@ -468,7 +468,7 @@ bool regmap_reg_in_ranges(unsigned int reg, * * @reg: Offset of the register within the regmap bank * @lsb: lsb of the register field. - * @reg: msb of the register field. + * @msb: msb of the register field. * @id_size: port size if it has some ports * @id_offset: address offset for each ports */ |