diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-29 00:19:06 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-29 00:19:06 +0200 |
| commit | 87c7662bea584d5e495e97a59c20b9abaac4eee8 (patch) | |
| tree | b93f4345acb47f9c23d0b21ed276980cea56254f /include | |
| parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/po... (diff) | |
| parent | of/irq: do irq resolution in platform_get_irq (diff) | |
| download | linux-87c7662bea584d5e495e97a59c20b9abaac4eee8.tar.xz linux-87c7662bea584d5e495e97a59c20b9abaac4eee8.zip | |
Merge tag 'dt-for-linus' of git://git.secretlab.ca/git/linux
Pull devicetree bug fixes from Grant Likely:
"These are some important bug fixes that need to get into v3.15.
This branch contains a pair of important bug fixes for the DT code:
- Fix some incorrect binding property names before they enter common
usage
- Fix bug where some platform devices will be unable to get their
interrupt number when they depend on an interrupt controller that
is not available at device creation time. This is a problem
causing mainline to fail on a number of ARM platforms"
* tag 'dt-for-linus' of git://git.secretlab.ca/git/linux:
of/irq: do irq resolution in platform_get_irq
of: selftest: add deferred probe interrupt test
dt: Fix binding typos in clock-names and interrupt-names
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/of_irq.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/of_irq.h b/include/linux/of_irq.h index 3f23b4472c31..6404253d810d 100644 --- a/include/linux/of_irq.h +++ b/include/linux/of_irq.h @@ -44,11 +44,16 @@ extern void of_irq_init(const struct of_device_id *matches); #ifdef CONFIG_OF_IRQ extern int of_irq_count(struct device_node *dev); +extern int of_irq_get(struct device_node *dev, int index); #else static inline int of_irq_count(struct device_node *dev) { return 0; } +static inline int of_irq_get(struct device_node *dev, int index) +{ + return 0; +} #endif #if defined(CONFIG_OF) |