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

2013-02-14 17:11:08 +00:00
parent 7798b582d3 378e8ee2f8
commit 5dea215028
4 changed files with 102 additions and 26 deletions
--- a/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@ -398,6 +398,7 @@ struct regmap_irq_chip {
 	unsigned int wake_base;
 	unsigned int irq_reg_stride;
 	unsigned int mask_invert;
+	unsigned int wake_invert;
 	bool runtime_pm;

 	int num_regs;