aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-08-08 21:25:17 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-08-08 21:25:17 -0400
commitbe2136e5c99fd5faa655e571b507362b27df1a28 (patch)
tree2d06e9fa0be2bfabdcad485c9388ad0657cfbbb1
parent2efe1642b73e74604498175de032b8a604868fb7 (diff)
parent3566cc9d90e3f774cea47de6986c59a09090ce2b (diff)
Merge branch 'regmap-interface' into regmap-next
-rw-r--r--include/linux/regmap.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/include/linux/regmap.h b/include/linux/regmap.h
index c878a4bf717e..4de137bc16a7 100644
--- a/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@ -27,15 +27,15 @@ struct spi_device;
27 * @val_bits: Number of bits in a register value, mandatory. 27 * @val_bits: Number of bits in a register value, mandatory.
28 * 28 *
29 * @max_register: Optional, specifies the maximum valid register index. 29 * @max_register: Optional, specifies the maximum valid register index.
30 * @writeable_register: Optional callback returning true if the register 30 * @writeable_reg: Optional callback returning true if the register
31 * can be written to. 31 * can be written to.
32 * @readable_register: Optional callback returning true if the register 32 * @readable_reg: Optional callback returning true if the register
33 * can be read from. 33 * can be read from.
34 * @volatile_register: Optional callback returning true if the register 34 * @volatile_reg: Optional callback returning true if the register
35 * value can't be cached. 35 * value can't be cached.
36 * @precious_register: Optional callback returning true if the rgister 36 * @precious_reg: Optional callback returning true if the rgister
37 * should not be read outside of a call from the driver 37 * should not be read outside of a call from the driver
38 * (eg, a clear on read interrupt status register). 38 * (eg, a clear on read interrupt status register).
39 */ 39 */
40struct regmap_config { 40struct regmap_config {
41 int reg_bits; 41 int reg_bits;