devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Andreas Larsson <andreas@gaisler.com>
To: Grant Likely <grant.likely@linaro.org>,
	Rob Herring <rob.herring@calxeda.com>
Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
	Lars Poeschel <larsi@wh2.tu-dresden.de>,
	software@gaisler.com
Subject: [PATCH] of: Define of_irq_find_parent dummy for !defined(CONFIG_OF_IRQ)
Date: Tue, 27 Aug 2013 09:57:17 +0200	[thread overview]
Message-ID: <1377590237-11046-1-git-send-email-andreas@gaisler.com> (raw)

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 <andreas@gaisler.com>
---
 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

             reply	other threads:[~2013-08-27  7:57 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-27  7:57 Andreas Larsson [this message]
2013-08-27 13:12 ` [PATCH] of: Define of_irq_find_parent dummy for !defined(CONFIG_OF_IRQ) Rob Herring
2013-08-27 13:21   ` Andreas Larsson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1377590237-11046-1-git-send-email-andreas@gaisler.com \
    --to=andreas@gaisler.com \
    --cc=devicetree@vger.kernel.org \
    --cc=grant.likely@linaro.org \
    --cc=larsi@wh2.tu-dresden.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rob.herring@calxeda.com \
    --cc=software@gaisler.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).