From: Grant Likely <grant.likely@secretlab.ca>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
devicetree-discuss@lists.ozlabs.org,
Shawn Guo <shawn.guo@linaro.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
linux-kernel@vger.kernel.org
Subject: [PATCH] drivers/of: Fix sparc build failure caused by of_alias_scan
Date: Thu, 04 Aug 2011 08:05:42 +0100 [thread overview]
Message-ID: <20110804070033.20042.28741.stgit@ponder> (raw)
Commit 750f463a, "dt: add of_alias_scan and of_alias_get_id" breaks
platforms that don't use CONFIG_OF_FLATTREE, like SPARC and OLPC. Fix
it by only building it on platforms using the flat tree.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
---
Hi Linus,
Hand me the paper bag, I completely screwed up that last commit. The
previous commit fixes imx, but breaks SPARC. I apologize, and rightly
accept any due punishment.
This patch fixes it, and it is also pushed out to devicetree/next:
The following changes since commit
a9e4e6e14c322e08d1c615afc8f504fb415f9613:
Merge branch 'for-next' of
git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
(2011-08-03 15:12:09 -1000)
are available in the git repository at:
git://git.secretlab.ca/git/linux-2.6 devicetree/next
Grant Likely (1):
drivers/of: Fix sparc build failure caused by of_alias_scan
drivers/of/base.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/drivers/of/base.c b/drivers/of/base.c
index fb28b5a..c81a0fe 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -1013,6 +1013,7 @@ out_unlock:
}
#endif /* defined(CONFIG_OF_DYNAMIC) */
+#ifdef CONFIG_OF_FLATTREE
static void of_alias_add(struct alias_prop *ap, struct device_node *np,
int id, const char *stem, int stem_len)
{
@@ -1118,3 +1119,4 @@ int of_alias_get_id(struct device_node *np, const char *stem)
return id;
}
EXPORT_SYMBOL_GPL(of_alias_get_id);
+#endif /* CONFIG_OF_FLATTREE */
next reply other threads:[~2011-08-04 7:05 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-04 7:05 Grant Likely [this message]
2011-08-04 7:13 ` [PATCH] drivers/of: Fix sparc build failure caused by of_alias_scan David Miller
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=20110804070033.20042.28741.stgit@ponder \
--to=grant.likely@secretlab.ca \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=shawn.guo@linaro.org \
--cc=torvalds@linux-foundation.org \
/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