From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andreas Larsson Subject: [PATCH] of: Define of_irq_find_parent dummy for !defined(CONFIG_OF_IRQ) Date: Tue, 27 Aug 2013 09:57:17 +0200 Message-ID: <1377590237-11046-1-git-send-email-andreas@gaisler.com> Return-path: Sender: linux-kernel-owner@vger.kernel.org To: Grant Likely , Rob Herring Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Lars Poeschel , software@gaisler.com List-Id: devicetree@vger.kernel.org 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 --- 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