Merge drm/drm-next into drm-misc-next

[sfrench/cifs-2.6.git] / include / drm / drm_exec.h

diff --git a/include/drm/drm_exec.h b/include/drm/drm_exec.h
index f1a66c0487217b71ef9ab2b369817a5833799db5..aa786b828a0a412744ff724d4326fd8c56538d71 100644 (file)
--- a/include/drm/drm_exec.h
+++ b/include/drm/drm_exec.h
@@ -18,7 +18,7 @@ struct drm_exec {
        /**
         * @flags: Flags to control locking behavior
         */
-       uint32_t                flags;
+       u32                     flags;
 
        /**
         * @ticket: WW ticket used for acquiring locks
@@ -135,7 +135,7 @@ static inline bool drm_exec_is_contended(struct drm_exec *exec)
        return !!exec->contended;
 }
 
-void drm_exec_init(struct drm_exec *exec, uint32_t flags, unsigned nr);
+void drm_exec_init(struct drm_exec *exec, u32 flags, unsigned nr);
 void drm_exec_fini(struct drm_exec *exec);
 bool drm_exec_cleanup(struct drm_exec *exec);
 int drm_exec_lock_obj(struct drm_exec *exec, struct drm_gem_object *obj);