diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2012-05-20 20:18:37 -0600 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2012-05-20 20:18:37 -0600 |
| commit | 8d6c1efa51236bb781f202aa13b9f4ba654978c6 (patch) | |
| tree | c5110676a2be7d9879caad3f30291cf6657661b3 /include/linux | |
| parent | 3679362355f6ec6abdbd8f38da3d89f94746a2a5 (diff) | |
| parent | 0a68214b76ca858c46b73d2e9792671f0ac0b7e2 (diff) | |
| download | linux-stable-8d6c1efa51236bb781f202aa13b9f4ba654978c6.tar.gz linux-stable-8d6c1efa51236bb781f202aa13b9f4ba654978c6.tar.bz2 linux-stable-8d6c1efa51236bb781f202aa13b9f4ba654978c6.zip | |
Merge branch 'devicetree/merge' into devicetree/next
Diffstat (limited to 'include/linux')
| -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 */ |