drm_file used drm_magic_t from uapi/drm/drm.h. This is a simple unsigned int. Just opencode it as such to break the dependency from this header file to uapi.
Signed-off-by: Sam Ravnborg <s...@ravnborg.org> Suggested-by: Daniel Vetter <daniel.vet...@ffwll.ch> Cc: Sean Paul <seanp...@chromium.org> Cc: Liviu Dudau <liviu.du...@arm.com> Cc: Chris Wilson <ch...@chris-wilson.co.uk> Cc: Maarten Lankhorst <maarten.lankho...@linux.intel.com> Cc: Maxime Ripard <maxime.rip...@bootlin.com> Cc: David Airlie <airl...@linux.ie> Cc: Daniel Vetter <dan...@ffwll.ch> Cc: Jani Nikula <jani.nik...@intel.com> Cc: Eric Anholt <e...@anholt.net> --- include/drm/drm_file.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/include/drm/drm_file.h b/include/drm/drm_file.h index 67af60bb527a..046cd1bf91eb 100644 --- a/include/drm/drm_file.h +++ b/include/drm/drm_file.h @@ -34,8 +34,6 @@ #include <linux/completion.h> #include <linux/idr.h> -#include <uapi/drm/drm.h> - #include <drm/drm_prime.h> struct dma_fence; @@ -227,7 +225,7 @@ struct drm_file { struct pid *pid; /** @magic: Authentication magic, see @authenticated. */ - drm_magic_t magic; + unsigned int magic; /** * @lhead: -- 2.20.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx