diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-14 12:11:08 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-14 12:11:08 -0500 |
| commit | 5dea215028686a67e815c32a54dc89fb3467ab05 (patch) | |
| tree | a00295f8c31e2c2b3ecfe397a3a792177e957cba /include/linux/regmap.h | |
| parent | 7798b582d31e92227ca457f93db320ad9654dada (diff) | |
| parent | 378e8ee2f842ccf5a14516741119468fc55b17f0 (diff) | |
Merge remote-tracking branch 'regmap/topic/irq' into regmap-next
Diffstat (limited to 'include/linux/regmap.h')
| -rw-r--r-- | include/linux/regmap.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/regmap.h b/include/linux/regmap.h index 7e2a48e25bd4..9e790f956025 100644 --- a/include/linux/regmap.h +++ b/include/linux/regmap.h | |||
| @@ -398,6 +398,7 @@ struct regmap_irq_chip { | |||
| 398 | unsigned int wake_base; | 398 | unsigned int wake_base; |
| 399 | unsigned int irq_reg_stride; | 399 | unsigned int irq_reg_stride; |
| 400 | unsigned int mask_invert; | 400 | unsigned int mask_invert; |
| 401 | unsigned int wake_invert; | ||
| 401 | bool runtime_pm; | 402 | bool runtime_pm; |
| 402 | 403 | ||
| 403 | int num_regs; | 404 | int num_regs; |