These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / gpu / drm / nouveau / nouveau_chan.h

diff --git a/kernel/drivers/gpu/drm/nouveau/nouveau_chan.h b/kernel/drivers/gpu/drm/nouveau/nouveau_chan.h
index 8b3640f..48062c9 100644 (file)
--- a/kernel/drivers/gpu/drm/nouveau/nouveau_chan.h
+++ b/kernel/drivers/gpu/drm/nouveau/nouveau_chan.h
@@ -37,13 +37,12 @@ struct nouveau_channel {
        u32 user_get;
        u32 user_put;
 
-       struct nvif_object *object;
+       struct nvif_object user;
 };
 
 
 int  nouveau_channel_new(struct nouveau_drm *, struct nvif_device *,
-                        u32 handle, u32 arg0, u32 arg1,
-                        struct nouveau_channel **);
+                        u32 arg0, u32 arg1, struct nouveau_channel **);
 void nouveau_channel_del(struct nouveau_channel **);
 int  nouveau_channel_idle(struct nouveau_channel *);