public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
From: Grant Likely <grant.likely@secretlab•ca>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
	Andrew Morton <akpm@linux-foundation•org>
Subject: Re: linux-next: build failure after merge of the devicetree tree
Date: Thu, 15 Jul 2010 00:06:40 -0600	[thread overview]
Message-ID: <AANLkTikubzqMV50eC5HErr4BBzvRsuVT9xTHkCJjD_BV@mail.gmail.com> (raw)
In-Reply-To: <20100715121508.61f66363.sfr@canb.auug.org.au>

On Wed, Jul 14, 2010 at 8:15 PM, Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> Hi Grant,
>
> After merging the devicetree tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> drivers/of/platform.c: In function 'of_device_make_bus_id':
> drivers/of/platform.c:437: error: implicit declaration of function 'of_translate_dcr_address'

Oops.  I reworked one of my patches which moved the dcr call into the
common code (protected by a #ifdef) because it was just to messy to
try and factor it out.  Here's the fix:

diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index 125f2bc..5be0080 100644
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -19,6 +19,10 @@
 #include <linux/of_device.h>
 #include <linux/of_platform.h>

+#if defined(CONFIG_PPC_DCR)
+#include <asm/dcr.h>
+#endif
+
 extern struct device_attribute of_platform_device_attrs[];

 static int of_platform_bus_match(struct device *dev, struct device_driver *drv)

I've pushed it out to my devicetree-next branch so it is ready for you tomorrow.

> As you requested, I have dropped that tree form linux-next for today.

Thanks.  I had to rebase, so by you dropping it I can do a trial merge
without conflicting against my old tree.

> Andrew, I hope this does not cause you too much pain.

If it does, you can pull in git://git.secretlab.ca/git/linux-2.6
next-devicetree.  It is fixed now.

g.

-- 
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.

  reply	other threads:[~2010-07-15  6:07 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-07-15  2:15 linux-next: build failure after merge of the devicetree tree Stephen Rothwell
2010-07-15  6:06 ` Grant Likely [this message]
  -- strict thread matches above, loose matches on Subject: below --
2010-07-30  3:57 Stephen Rothwell
2010-07-30  6:11 ` Grant Likely
2011-10-05  5:24 Stephen Rothwell
2011-10-05  5:54 ` Grant Likely
2014-05-26  5:05 Stephen Rothwell
2014-05-26  7:22 ` Thomas Petazzoni
2023-04-11  2:28 Stephen Rothwell
2023-12-07  1:57 Stephen Rothwell
2023-12-07 15:11 ` Rob Herring
2023-12-07 20:58   ` Stephen Rothwell
2023-12-07 22:05     ` Rob Herring
2023-12-08  3:11       ` Stephen Rothwell
2023-12-08  2:51 Stephen Rothwell
2023-12-08  7:34 ` Krzysztof Kozlowski
2023-12-11  5:05 Stephen Rothwell
2023-12-12  9:04 ` Sibi Sankar
2024-01-19  0:58 ` Stephen Rothwell
2024-01-19 14:07   ` Rob Herring
2025-11-17  4:13 Stephen Rothwell

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=AANLkTikubzqMV50eC5HErr4BBzvRsuVT9xTHkCJjD_BV@mail.gmail.com \
    --to=grant.likely@secretlab$(echo .)ca \
    --cc=akpm@linux-foundation$(echo .)org \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=sfr@canb$(echo .)auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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