Skip to content

Commit

Permalink
drm: align #include directives with libdrm in uapi headers
Browse files Browse the repository at this point in the history
We can't use <drm/*.h> because that upsets the serach paths in libdrm.
Also, drop the circular inclusion in drm_mode.h.

v2: Actually change the right headers.

v3: Drop the #include removal per Emil's request.

Cc: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1459353292-9063-1-git-send-email-daniel.vetter@ffwll.ch
  • Loading branch information
Daniel Vetter committed Mar 30, 2016
1 parent 4c4925f commit 0b1ccd4
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion include/uapi/drm/drm.h
Original file line number Diff line number Diff line change
Expand Up @@ -685,7 +685,7 @@ struct drm_prime_handle {
__s32 fd;
};

#include <drm/drm_mode.h>
#include "drm_mode.h"

#define DRM_IOCTL_BASE 'd'
#define DRM_IO(nr) _IO(DRM_IOCTL_BASE,nr)
Expand Down

0 comments on commit 0b1ccd4

Please sign in to comment.