projects/linux·commit 7c8a2994

Merge remote-tracking branch 'regmap/topic/type' into regmap-next

7c8a2994 · Mark Brown <[email protected]> · 2012-12-11 12:39:49 +09:00

Commit
7c8a2994309214cbb6dba33cd72ec85f91fd6fcd
Parents
8e24a6e6 · a8f28cfa

Merge commit. Changes below are compared with the first parent: 8e24a6e6.

Changes

1 files changed · +1 −1

FileStatusAddDelContent
drivers/base/regmap/regmap.cmodified+1−1View file

drivers/base/regmap/regmap.c

View file
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 96f7e85..42d5cb0 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;