This changes the dummy version of of_irq_find_parent to be defined when !defined(CONFIG_OF_IRQ) instead of when !defined(CONFIG_OF). Without this of_irq_find_parent is undefined on SPARC that defines CONFIG_OF but not CONFIG_OF_IRQ.
Signed-off-by: Andreas Larsson <[email protected]> --- include/linux/of_irq.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/include/linux/of_irq.h b/include/linux/of_irq.h index 535cecf..d0059a9 100644 --- a/include/linux/of_irq.h +++ b/include/linux/of_irq.h @@ -83,11 +83,13 @@ static inline unsigned int irq_of_parse_and_map(struct device_node *dev, { return 0; } +#endif /* !CONFIG_OF */ + +#endif /* __OF_IRQ_H */ +#if !defined(CONFIG_OF_IRQ) static inline void *of_irq_find_parent(struct device_node *child) { return NULL; } -#endif /* !CONFIG_OF */ - -#endif /* __OF_IRQ_H */ +#endif /* !CONFIG_OF_IRQ */ -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
