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

Simple add/add conflict:
	drivers/base/regmap/regmap.c
This commit is contained in:
Mark Brown 2012-03-14 13:15:03 +00:00
commit eae4b51b21
2 changed files with 16 additions and 0 deletions

View file

@ -156,6 +156,7 @@ int regmap_update_bits(struct regmap *map, unsigned int reg,
int regmap_update_bits_check(struct regmap *map, unsigned int reg,
unsigned int mask, unsigned int val,
bool *change);
int regmap_get_val_bytes(struct regmap *map);
int regcache_sync(struct regmap *map);
int regcache_sync_region(struct regmap *map, unsigned int min,