diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-09 10:25:17 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-09 10:25:17 +0900 |
| commit | be2136e5c99fd5faa655e571b507362b27df1a28 (patch) | |
| tree | 2d06e9fa0be2bfabdcad485c9388ad0657cfbbb1 | |
| parent | 2efe1642b73e74604498175de032b8a604868fb7 (diff) | |
| parent | 3566cc9d90e3f774cea47de6986c59a09090ce2b (diff) | |
| download | linux-3.10-be2136e5c99fd5faa655e571b507362b27df1a28.tar.gz linux-3.10-be2136e5c99fd5faa655e571b507362b27df1a28.tar.bz2 linux-3.10-be2136e5c99fd5faa655e571b507362b27df1a28.zip | |
Merge branch 'regmap-interface' into regmap-next
| -rw-r--r-- | include/linux/regmap.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/include/linux/regmap.h b/include/linux/regmap.h index c878a4bf717..4de137bc16a 100644 --- a/include/linux/regmap.h +++ b/include/linux/regmap.h @@ -27,15 +27,15 @@ struct spi_device; * @val_bits: Number of bits in a register value, mandatory. * * @max_register: Optional, specifies the maximum valid register index. - * @writeable_register: Optional callback returning true if the register - * can be written to. - * @readable_register: Optional callback returning true if the register - * can be read from. - * @volatile_register: Optional callback returning true if the register - * value can't be cached. - * @precious_register: Optional callback returning true if the rgister - * should not be read outside of a call from the driver - * (eg, a clear on read interrupt status register). + * @writeable_reg: Optional callback returning true if the register + * can be written to. + * @readable_reg: Optional callback returning true if the register + * can be read from. + * @volatile_reg: Optional callback returning true if the register + * value can't be cached. + * @precious_reg: Optional callback returning true if the rgister + * should not be read outside of a call from the driver + * (eg, a clear on read interrupt status register). */ struct regmap_config { int reg_bits; |