Hi Jyri, On Friday 24 Mar 2017 16:47:52 Jyri Sarha wrote: > The enum omap_plane conflicted with the same struct name for omapdrm > plane private data. This rename should solve the conflict. > > The rename was implement with this very simple coccinelle patch: > ------------------------ > @@ > @@ > enum > -omap_plane > +omap_plane_id > ------------------------ > The patch was applied like this: > spatch --sp-file <cocci_file> --all-includes --in-place --dir > drivers/gpu/drm/omapdrm > > The above patch did not rename the actual enum definition. That was > added manually on top of the spatch changes. > > Signed-off-by: Jyri Sarha <jsarha@xxxxxx> Acked-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx> > --- > drivers/gpu/drm/omapdrm/dss/dispc.c | 124 +++++++++++++------------- > drivers/gpu/drm/omapdrm/dss/dispc.h | 62 +++++++-------- > drivers/gpu/drm/omapdrm/dss/dss.h | 5 +- > drivers/gpu/drm/omapdrm/dss/dss_features.c | 6 +- > drivers/gpu/drm/omapdrm/dss/dss_features.h | 6 +- > drivers/gpu/drm/omapdrm/dss/omapdss.h | 17 ++-- > 6 files changed, 117 insertions(+), 103 deletions(-) -- Regards, Laurent Pinchart _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel