On Wed, Dec 26, 2018 at 10:03:47PM +0100, Sam Ravnborg wrote: > Move DRM_IF_VERSION out of drmP.h to allow users > to get rid of the drmP include. > > Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx> > Cc: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxxxx> > Cc: Maxime Ripard <maxime.ripard@xxxxxxxxxxx> > Cc: Sean Paul <sean@xxxxxxxxxx> > Cc: David Airlie <airlied@xxxxxxxx> > Cc: Daniel Vetter <daniel@xxxxxxxx> Applied to drm-misc-next, thanks for your patch. -Daniel > --- > drivers/gpu/drm/drm_internal.h | 2 ++ > include/drm/drmP.h | 2 -- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/drm_internal.h b/drivers/gpu/drm/drm_internal.h > index 51e06defc8d8..e9374cd43610 100644 > --- a/drivers/gpu/drm/drm_internal.h > +++ b/drivers/gpu/drm/drm_internal.h > @@ -26,6 +26,8 @@ > #define DRM_IF_MAJOR 1 > #define DRM_IF_MINOR 4 > > +#define DRM_IF_VERSION(maj, min) (maj << 16 | min) > + > struct drm_prime_file_private; > struct dma_buf; > > diff --git a/include/drm/drmP.h b/include/drm/drmP.h > index 05350424a4d3..b6b8436b5123 100644 > --- a/include/drm/drmP.h > +++ b/include/drm/drmP.h > @@ -95,8 +95,6 @@ struct dma_buf_attachment; > struct pci_dev; > struct pci_controller; > > -#define DRM_IF_VERSION(maj, min) (maj << 16 | min) > - > #define DRM_SWITCH_POWER_ON 0 > #define DRM_SWITCH_POWER_OFF 1 > #define DRM_SWITCH_POWER_CHANGING 2 > -- > 2.12.0 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel
