summaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-11 12:39:49 +0900
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-11 12:39:49 +0900
commit7c8a2994309214cbb6dba33cd72ec85f91fd6fcd (patch)
treebfba9ecbaa48f68d03715454e4fbf5d8e1a59fce /drivers/base
parent8e24a6e696ebdc44513357ac00b6ee18f54e69f5 (diff)
parenta8f28cfad8cd44d7c34b166d0e5ace1125dbee1f (diff)
downloadblackbird-op-linux-7c8a2994309214cbb6dba33cd72ec85f91fd6fcd.tar.gz
blackbird-op-linux-7c8a2994309214cbb6dba33cd72ec85f91fd6fcd.zip
Merge remote-tracking branch 'regmap/topic/type' into regmap-next
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/regmap/regmap.c2
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)
}
static bool regmap_volatile_range(struct regmap *map, unsigned int reg,
- unsigned int num)
+ size_t num)
{
unsigned int i;
OpenPOWER on IntegriCloud