From: jason@lakedaemon.net (Jason Cooper)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: orion5x: fix mvebu_mbus_dt_init call
Date: Wed, 4 Jun 2014 09:45:34 -0400 [thread overview]
Message-ID: <20140604134534.GC8664@titan.lakedaemon.net> (raw)
In-Reply-To: <7365244.alxTZQocGr@wuerfel>
On Wed, Jun 04, 2014 at 12:36:49PM +0200, Arnd Bergmann wrote:
> On Wednesday 04 June 2014 11:40:06 Thomas Petazzoni wrote:
> >
> > On Wed, 04 Jun 2014 11:06:40 +0200, Arnd Bergmann wrote:
> > > The prototype for mvebu_mbus_dt_init() changed around the same time
> > > as a new caller was added to orion5x. This adds the missing argument
> > > to make orion5x behave correctly to avoid this build error:
> > >
> > > mach-orion5x/board-dt.c: In function 'orion5x_dt_init':
> > > mach-orion5x/board-dt.c:48:2: error: too few arguments to function 'mvebu_mbus_dt_init'
> > > BUG_ON(mvebu_mbus_dt_init());
> > > ^
> > > In file included from mach-orion5x/board-dt.c:18:0:
> > > include/linux/mbus.h:76:5: note: declared here
> > > int mvebu_mbus_dt_init(bool is_coherent);
> > > ^
> > >
> > > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> >
> > Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> >
>
> Ok, thanks!
>
> I've added my patch to the next/soc2 branch now, which already contains
> both branches that introduce the problem when combined.
>
> This saves us creating a fixes branch on top of the mid-merge window
> state of torvalds/next.
Thanks, Arnd. That was most likely my fault. I also don't recall what
happened, but your fix is the correct one. Thanks for catching that.
thx,
Jason.
prev parent reply other threads:[~2014-06-04 13:45 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-04 9:06 [PATCH] ARM: orion5x: fix mvebu_mbus_dt_init call Arnd Bergmann
2014-06-04 9:40 ` Thomas Petazzoni
2014-06-04 10:36 ` Arnd Bergmann
2014-06-04 13:45 ` Jason Cooper [this message]
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=20140604134534.GC8664@titan.lakedaemon.net \
--to=jason@lakedaemon.net \
--cc=linux-arm-kernel@lists.infradead.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