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 <[email protected]> Suggested-by: Daniel Vetter <[email protected]> Cc: Sean Paul <[email protected]> Cc: Liviu Dudau <[email protected]> Cc: Chris Wilson <[email protected]> Cc: Maarten Lankhorst <[email protected]> Cc: Maxime Ripard <[email protected]> Cc: David Airlie <[email protected]> Cc: Daniel Vetter <[email protected]> Cc: Jani Nikula <[email protected]> Cc: Eric Anholt <[email protected]> --- 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 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
