diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-05 11:21:05 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-05 11:21:05 -0500 |
| commit | 681ba97d9fbff59f67c71f1d9a88ad0b8ef49d25 (patch) | |
| tree | a9f2719a6a283bdbca27167aa2803cd8ddae6930 /include/linux | |
| parent | 8569d023a0db699c462337d471f7e92163142e37 (diff) | |
| parent | 209a600623cf13a8168b2f6b83643db7825abb9a (diff) | |
Merge branch 'regmap/irq' into regmap-next
Diffstat (limited to 'include/linux')
| -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 cfce3a358fbf..eb93921cdd30 100644 --- a/include/linux/regmap.h +++ b/include/linux/regmap.h | |||
| @@ -195,5 +195,6 @@ int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags, | |||
| 195 | int irq_base, struct regmap_irq_chip *chip, | 195 | int irq_base, struct regmap_irq_chip *chip, |
| 196 | struct regmap_irq_chip_data **data); | 196 | struct regmap_irq_chip_data **data); |
| 197 | void regmap_del_irq_chip(int irq, struct regmap_irq_chip_data *data); | 197 | void regmap_del_irq_chip(int irq, struct regmap_irq_chip_data *data); |
| 198 | int regmap_irq_chip_get_base(struct regmap_irq_chip_data *data); | ||
| 198 | 199 | ||
| 199 | #endif | 200 | #endif |