From: Paul Gortmaker <paul.gortmaker@windriver.com>
To: Tony Lindgren <tony@atomide.com>
Cc: Linus Walleij <linus.walleij@linaro.org>,
linux-gpio@vger.kernel.org,
Alexandre Courbot <acourbot@nvidia.com>
Subject: Re: [PATCH] ARM: omap2: fix missing include
Date: Fri, 23 Sep 2016 15:15:56 -0400 [thread overview]
Message-ID: <20160923191556.GN8825@windriver.com> (raw)
In-Reply-To: <20160923141313.y7xp2yyv74nk2v3a@atomide.com>
[Re: [PATCH] ARM: omap2: fix missing include] On 23/09/2016 (Fri 07:13) Tony Lindgren wrote:
> * Linus Walleij <linus.walleij@linaro.org> [160923 05:40]:
> > commit d47529b2e9fe
> > "gpio: don't include module.h in shared driver header"
> > removed <linux/module.h> from the <linux/gpio/driver.h> header.
> >
> > It seems arch/arm/mach-omap2/board-rx51-peripherals.c
> > is using __initdata_or_module from <linux/module.h> through
> > <linux/gpio.h> to <linux/gpio/driver.h>, so break this dependency
> > so that we get a clean compile.
> >
> > Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
> > Cc: Tony Lindgren <tony@atomide.com>
> > Fixes: d47529b2e9fe ("gpio: don't include module.h in shared driver header")
> > Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> > ---
> > Tony: please ACK this if it's OK so I can merge it in front of
> > the offending patch.
>
> This file is gone in Linux next but if you need it:
>
> Acked-by: Tony Lindgren <tony@atomide.com>
>
> Sorry the removal got postponed from v4.8 to v4.9. Note that
> it will produce a trivial merge conflict.
Ah, that explains it. Linus, I'd come across this a few months ago, and
sent Tony a different fix for it:
https://patchwork.kernel.org/patch/9238801/
Paul.
--
>
> > ---
> > arch/arm/mach-omap2/board-rx51-peripherals.c | 1 +
> > 1 file changed, 1 insertion(+)
> >
> > diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c
> > index a5ab712c1a59..6d3af43ae3e4 100644
> > --- a/arch/arm/mach-omap2/board-rx51-peripherals.c
> > +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
> > @@ -29,6 +29,7 @@
> > #include <linux/power/isp1704_charger.h>
> > #include <linux/platform_data/spi-omap2-mcspi.h>
> > #include <linux/platform_data/mtd-onenand-omap2.h>
> > +#include <linux/module.h>
> >
> > #include <plat/dmtimer.h>
> >
> > --
> > 2.7.4
> >
next prev parent reply other threads:[~2016-09-23 19:16 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-23 12:40 [PATCH] ARM: omap2: fix missing include Linus Walleij
2016-09-23 14:13 ` Tony Lindgren
2016-09-23 14:20 ` Linus Walleij
2016-09-23 19:15 ` Paul Gortmaker [this message]
2016-09-30 16:06 ` Linus Walleij
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=20160923191556.GN8825@windriver.com \
--to=paul.gortmaker@windriver.com \
--cc=acourbot@nvidia.com \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=tony@atomide.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).