diff options
| author | Benoit Cousson <b-cousson@ti.com> | 2012-02-27 13:32:39 +0400 |
|---|---|---|
| committer | Benoit Cousson <b-cousson@ti.com> | 2012-02-27 13:32:39 +0400 |
| commit | 1f52299ec000e2161635b263d81ab92ea7f1f0a7 (patch) | |
| tree | 66b1414ce81dacf5758e824640f869d16d024c4a /include/linux/of_irq.h | |
| parent | ffd76d8be36da09f8456c55569c008f5aa93095e (diff) | |
| parent | 280ad7fda5f95211857fda38960f2b6fdf6edd3e (diff) | |
| download | linux-1f52299ec000e2161635b263d81ab92ea7f1f0a7.tar.xz | |
Merge branch 'irqdomain/next' of git://git.secretlab.ca/git/linux-2.6 into for_3.4/dt_irq_domain2
Diffstat (limited to 'include/linux/of_irq.h')
| -rw-r--r-- | include/linux/of_irq.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/linux/of_irq.h b/include/linux/of_irq.h index d0307eed20c9..d229ad3edee0 100644 --- a/include/linux/of_irq.h +++ b/include/linux/of_irq.h @@ -6,6 +6,7 @@ struct of_irq; #include <linux/types.h> #include <linux/errno.h> #include <linux/irq.h> +#include <linux/irqdomain.h> #include <linux/ioport.h> #include <linux/of.h> @@ -65,9 +66,6 @@ extern int of_irq_map_one(struct device_node *device, int index, extern unsigned int irq_create_of_mapping(struct device_node *controller, const u32 *intspec, unsigned int intsize); -#ifdef CONFIG_IRQ_DOMAIN -extern void irq_dispose_mapping(unsigned int irq); -#endif extern int of_irq_to_resource(struct device_node *dev, int index, struct resource *r); extern int of_irq_count(struct device_node *dev); |