| Message ID | 1474634412-7050-1-git-send-email-linus.walleij@linaro.org |
|---|---|
| State | Accepted |
| Commit | 9132ce450bd141cd8c5776b41e90f146cae4bc3b |
| Headers | show |
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 -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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 -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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>
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(+) -- 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html