diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-14 17:11:08 +0000 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-14 17:11:08 +0000 |
commit | 5dea215028686a67e815c32a54dc89fb3467ab05 (patch) | |
tree | a00295f8c31e2c2b3ecfe397a3a792177e957cba /include | |
parent | Merge remote-tracking branch 'regmap/topic/flat' into regmap-next (diff) | |
parent | mfd: wm5110: Mark wakes as inverted (diff) | |
download | linux-dev-5dea215028686a67e815c32a54dc89fb3467ab05.tar.xz linux-dev-5dea215028686a67e815c32a54dc89fb3467ab05.zip |
Merge remote-tracking branch 'regmap/topic/irq' into regmap-next
Diffstat (limited to 'include')
-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 { unsigned int wake_base; unsigned int irq_reg_stride; unsigned int mask_invert; + unsigned int wake_invert; bool runtime_pm; int num_regs; |