[PATCH] drivers/of: Fix sparc build failure caused by of_alias_scan

[PATCH] drivers/of: Fix sparc build failure caused by of_alias_scan

[Grant Likely]

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 */

Re: [PATCH] drivers/of: Fix sparc build failure caused by of_alias_scan

[David Miller]

From: Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>
Date: Thu, 04 Aug 2011 08:05:42 +0100

> 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-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>

Grant this is completely bogus see my email I just posted on
linux-next.