diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-10 22:39:49 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-10 22:39:49 -0500 |
| commit | 7c8a2994309214cbb6dba33cd72ec85f91fd6fcd (patch) | |
| tree | bfba9ecbaa48f68d03715454e4fbf5d8e1a59fce /drivers/base | |
| parent | 8e24a6e696ebdc44513357ac00b6ee18f54e69f5 (diff) | |
| parent | a8f28cfad8cd44d7c34b166d0e5ace1125dbee1f (diff) | |
Merge remote-tracking branch 'regmap/topic/type' into regmap-next
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/regmap/regmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c index 96f7e8523ee8..42d5cb0f503f 100644 --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c | |||
| @@ -124,7 +124,7 @@ bool regmap_precious(struct regmap *map, unsigned int reg) | |||
| 124 | } | 124 | } |
| 125 | 125 | ||
| 126 | static bool regmap_volatile_range(struct regmap *map, unsigned int reg, | 126 | static bool regmap_volatile_range(struct regmap *map, unsigned int reg, |
| 127 | unsigned int num) | 127 | size_t num) |
| 128 | { | 128 | { |
| 129 | unsigned int i; | 129 | unsigned int i; |
| 130 | 130 | ||