diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-10 22:39:29 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-10 22:39:29 -0500 |
commit | 4d348e6e0a35cd1b40196a463f1159ae5d582770 (patch) | |
tree | 914c629a0f0ff6c3015c7afb0a4317df465c9246 /include/linux/regmap.h | |
parent | bcf86687d676fa478c71201294b296126212f06c (diff) | |
parent | 90f790d2dc96f5a61855ae65b90e30c40c893a20 (diff) |
Merge remote-tracking branch 'regmap/topic/domain' into regmap-next
Diffstat (limited to 'include/linux/regmap.h')
-rw-r--r-- | include/linux/regmap.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/regmap.h b/include/linux/regmap.h index 9f228d7f7ac4..41e9e4e17657 100644 --- a/include/linux/regmap.h +++ b/include/linux/regmap.h | |||
@@ -19,6 +19,7 @@ | |||
19 | struct module; | 19 | struct module; |
20 | struct device; | 20 | struct device; |
21 | struct i2c_client; | 21 | struct i2c_client; |
22 | struct irq_domain; | ||
22 | struct spi_device; | 23 | struct spi_device; |
23 | struct regmap; | 24 | struct regmap; |
24 | struct regmap_range_cfg; | 25 | struct regmap_range_cfg; |
@@ -321,6 +322,7 @@ int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags, | |||
321 | void regmap_del_irq_chip(int irq, struct regmap_irq_chip_data *data); | 322 | void regmap_del_irq_chip(int irq, struct regmap_irq_chip_data *data); |
322 | int regmap_irq_chip_get_base(struct regmap_irq_chip_data *data); | 323 | int regmap_irq_chip_get_base(struct regmap_irq_chip_data *data); |
323 | int regmap_irq_get_virq(struct regmap_irq_chip_data *data, int irq); | 324 | int regmap_irq_get_virq(struct regmap_irq_chip_data *data, int irq); |
325 | struct irq_domain *regmap_irq_get_domain(struct regmap_irq_chip_data *data); | ||
324 | 326 | ||
325 | #else | 327 | #else |
326 | 328 | ||