* [PATCH] ARM: omap2: fix missing include
@ 2016-09-23 12:40 Linus Walleij
2016-09-23 14:13 ` Tony Lindgren
0 siblings, 1 reply; 5+ messages in thread
From: Linus Walleij @ 2016-09-23 12:40 UTC (permalink / raw)
To: linux-gpio, Alexandre Courbot
Cc: Linus Walleij, Paul Gortmaker, Tony Lindgren
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.
---
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
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] ARM: omap2: fix missing include
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
0 siblings, 2 replies; 5+ messages in thread
From: Tony Lindgren @ 2016-09-23 14:13 UTC (permalink / raw)
To: Linus Walleij; +Cc: linux-gpio, Alexandre Courbot, Paul Gortmaker
* 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.
> ---
> 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
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] ARM: omap2: fix missing include
2016-09-23 14:13 ` Tony Lindgren
@ 2016-09-23 14:20 ` Linus Walleij
2016-09-23 19:15 ` Paul Gortmaker
1 sibling, 0 replies; 5+ messages in thread
From: Linus Walleij @ 2016-09-23 14:20 UTC (permalink / raw)
To: Tony Lindgren
Cc: linux-gpio@vger.kernel.org, Alexandre Courbot, Paul Gortmaker
On Fri, Sep 23, 2016 at 4:13 PM, Tony Lindgren <tony@atomide.com> 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.
OK thanks.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] ARM: omap2: fix missing include
2016-09-23 14:13 ` Tony Lindgren
2016-09-23 14:20 ` Linus Walleij
@ 2016-09-23 19:15 ` Paul Gortmaker
2016-09-30 16:06 ` Linus Walleij
1 sibling, 1 reply; 5+ messages in thread
From: Paul Gortmaker @ 2016-09-23 19:15 UTC (permalink / raw)
To: Tony Lindgren; +Cc: Linus Walleij, linux-gpio, Alexandre Courbot
[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
> >
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] ARM: omap2: fix missing include
2016-09-23 19:15 ` Paul Gortmaker
@ 2016-09-30 16:06 ` Linus Walleij
0 siblings, 0 replies; 5+ messages in thread
From: Linus Walleij @ 2016-09-30 16:06 UTC (permalink / raw)
To: Paul Gortmaker
Cc: Tony Lindgren, linux-gpio@vger.kernel.org, Alexandre Courbot
On Fri, Sep 23, 2016 at 12:15 PM, Paul Gortmaker
<paul.gortmaker@windriver.com> wrote:
>> 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/
Oh I see.
The only reason I patched it was because the build robots were
complaining, the problem will go away in the merge window one
way or another, sorry about all fuzz. Maybe I shouldn't be overly
eager to please the build robots. :/
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-09-30 16:06 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
2016-09-30 16:06 ` Linus Walleij
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).