forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Resolved simple add/add conflicts:
	drivers/base/regmap/internal.h
	drivers/base/regmap/regmap.c
This commit is contained in:
Mark Brown 2012-03-14 13:13:25 +00:00
commit 7d9aca39dc
1249 changed files with 11279 additions and 53556 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/linux/regmap.h
View file

@ -162,6 +162,9 @@ void regcache_cache_only(struct regmap *map, bool enable);
void regcache_cache_bypass(struct regmap *map, bool enable);
void regcache_mark_dirty(struct regmap *map);
int regmap_register_patch(struct regmap *map, const struct reg_default *regs,
int num_regs);
/**
* Description of an IRQ for the generic regmap irq_chip.
*