| Message ID | 20200706125931.752539-1-linus.walleij@linaro.org |
|---|---|
| State | Accepted |
| Commit | 85806f6d58f4db8aa398833ce46fedcd82ab58a1 |
| Headers | show |
| Series | omapfb/dss: Include the right header | expand |
On Mon, Jul 06, 2020 at 02:59:31PM +0200, Linus Walleij wrote: > The hdmi4.c and hdmi5.c files include the legacy GPIO > header <linux/gpio.h> but does not use any of the symbols > from this file. > > What it does use is the implicit inclusion of <linux/of.h> > leading to compile errors if we just drop this include. > > Include the right header. > > Cc: Tony Lindgren <tony@atomide.com> > Signed-off-by: Linus Walleij <linus.walleij@linaro.org> > --- > Tony if you're OK with this patch I will merge it through > the drm-misc tree once you ACKed it. I went ahead and applied this. Sam > --- > drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c | 2 +- > drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c b/drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c > index 7060ae56c062..f2d65aed7f76 100644 > --- a/drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c > +++ b/drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c > @@ -19,7 +19,7 @@ > #include <linux/platform_device.h> > #include <linux/pm_runtime.h> > #include <linux/clk.h> > -#include <linux/gpio.h> > +#include <linux/of.h> > #include <linux/regulator/consumer.h> > #include <linux/component.h> > #include <video/omapfb_dss.h> > diff --git a/drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c b/drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c > index ac49531e4732..d14d339f7fdf 100644 > --- a/drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c > +++ b/drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c > @@ -24,7 +24,7 @@ > #include <linux/platform_device.h> > #include <linux/pm_runtime.h> > #include <linux/clk.h> > -#include <linux/gpio.h> > +#include <linux/of.h> > #include <linux/regulator/consumer.h> > #include <linux/component.h> > #include <video/omapfb_dss.h> > -- > 2.25.4 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c b/drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c index 7060ae56c062..f2d65aed7f76 100644 --- a/drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c +++ b/drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c @@ -19,7 +19,7 @@ #include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/clk.h> -#include <linux/gpio.h> +#include <linux/of.h> #include <linux/regulator/consumer.h> #include <linux/component.h> #include <video/omapfb_dss.h> diff --git a/drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c b/drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c index ac49531e4732..d14d339f7fdf 100644 --- a/drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c +++ b/drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c @@ -24,7 +24,7 @@ #include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/clk.h> -#include <linux/gpio.h> +#include <linux/of.h> #include <linux/regulator/consumer.h> #include <linux/component.h> #include <video/omapfb_dss.h>
The hdmi4.c and hdmi5.c files include the legacy GPIO header <linux/gpio.h> but does not use any of the symbols from this file. What it does use is the implicit inclusion of <linux/of.h> leading to compile errors if we just drop this include. Include the right header. Cc: Tony Lindgren <tony@atomide.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- Tony if you're OK with this patch I will merge it through the drm-misc tree once you ACKed it. --- drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c | 2 +- drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.25.4 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel