aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/regmap.h
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-10 22:39:29 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-10 22:39:29 -0500
commit4d348e6e0a35cd1b40196a463f1159ae5d582770 (patch)
tree914c629a0f0ff6c3015c7afb0a4317df465c9246 /include/linux/regmap.h
parentbcf86687d676fa478c71201294b296126212f06c (diff)
parent90f790d2dc96f5a61855ae65b90e30c40c893a20 (diff)
Merge remote-tracking branch 'regmap/topic/domain' into regmap-next
Diffstat (limited to 'include/linux/regmap.h')
-rw-r--r--include/linux/regmap.h2
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 @@
19struct module; 19struct module;
20struct device; 20struct device;
21struct i2c_client; 21struct i2c_client;
22struct irq_domain;
22struct spi_device; 23struct spi_device;
23struct regmap; 24struct regmap;
24struct regmap_range_cfg; 25struct regmap_range_cfg;
@@ -321,6 +322,7 @@ int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags,
321void regmap_del_irq_chip(int irq, struct regmap_irq_chip_data *data); 322void regmap_del_irq_chip(int irq, struct regmap_irq_chip_data *data);
322int regmap_irq_chip_get_base(struct regmap_irq_chip_data *data); 323int regmap_irq_chip_get_base(struct regmap_irq_chip_data *data);
323int regmap_irq_get_virq(struct regmap_irq_chip_data *data, int irq); 324int regmap_irq_get_virq(struct regmap_irq_chip_data *data, int irq);
325struct irq_domain *regmap_irq_get_domain(struct regmap_irq_chip_data *data);
324 326
325#else 327#else
326 328