diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-24 13:55:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-24 13:55:24 -0700 |
| commit | b343c8beec664ef6f0e9964d3001c7c7966331ae (patch) | |
| tree | c61be2147a700ff83704164686e1db23461d0bb3 /include/linux | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha (diff) | |
| parent | irqdomain: Document size parameter of irq_domain_add_linear() (diff) | |
| download | linux-dev-b343c8beec664ef6f0e9964d3001c7c7966331ae.tar.xz linux-dev-b343c8beec664ef6f0e9964d3001c7c7966331ae.zip | |
Merge tag 'irqdomain-for-linus' of git://git.secretlab.ca/git/linux-2.6
Pull irqdomain changes from Grant Likely:
"Minor changes and fixups for irqdomain infrastructure. The most
important change adds the ability to remove a registered irqdomain."
* tag 'irqdomain-for-linus' of git://git.secretlab.ca/git/linux-2.6:
irqdomain: Document size parameter of irq_domain_add_linear()
irqdomain: trivial pr_fmt conversion.
irqdomain: Kill off duplicate definitions.
irqdomain: Make irq_domain_simple_map() static.
irqdomain: Export remaining public API symbols.
irqdomain: Support removal of IRQ domains.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/irqdomain.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h index c65740d76e66..5abb533eb8eb 100644 --- a/include/linux/irqdomain.h +++ b/include/linux/irqdomain.h @@ -141,9 +141,8 @@ static inline struct irq_domain *irq_domain_add_legacy_isa( return irq_domain_add_legacy(of_node, NUM_ISA_INTERRUPTS, 0, 0, ops, host_data); } -extern struct irq_domain *irq_find_host(struct device_node *node); -extern void irq_set_default_host(struct irq_domain *host); +extern void irq_domain_remove(struct irq_domain *host); extern unsigned int irq_create_mapping(struct irq_domain *host, irq_hw_number_t hwirq); |