diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-24 13:57:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-24 13:57:18 -0700 |
| commit | 0708500d49e8439d9fe5529795bdc1485f0f46c3 (patch) | |
| tree | 2019b8ebcd86c9b593e56ac1d630c921f130c8d3 /include | |
| parent | be122abe4bcd6d39b37892daae28c8bf5e4030fc (diff) | |
| parent | 8d6c1efa51236bb781f202aa13b9f4ba654978c6 (diff) | |
Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6
Pull device tree changes from Grant Likely:
"Mostly documentation updates, but also includes an empty stub for
non-CONFIG_OF builds."
* tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6:
dt/documentation: Fix value format description
dt: add vendor prefix for EM Microelectronics
ARM: DT: Add binding for GIC virtualization extentions (VGIC)
of/irq: add empty irq_of_parse_and_map() for non-dt builds
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/of_irq.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/include/linux/of_irq.h b/include/linux/of_irq.h index d229ad3edee0..1717cd935e1c 100644 --- a/include/linux/of_irq.h +++ b/include/linux/of_irq.h @@ -11,7 +11,7 @@ struct of_irq; #include <linux/of.h> /* - * irq_of_parse_and_map() is used ba all OF enabled platforms; but SPARC + * irq_of_parse_and_map() is used by all OF enabled platforms; but SPARC * implements it differently. However, the prototype is the same for all, * so declare it here regardless of the CONFIG_OF_IRQ setting. */ @@ -76,5 +76,13 @@ extern struct device_node *of_irq_find_parent(struct device_node *child); extern void of_irq_init(const struct of_device_id *matches); #endif /* CONFIG_OF_IRQ */ -#endif /* CONFIG_OF */ + +#else /* !CONFIG_OF */ +static inline unsigned int irq_of_parse_and_map(struct device_node *dev, + int index) +{ + return 0; +} +#endif /* !CONFIG_OF */ + #endif /* __OF_IRQ_H */ |