Merge remote-tracking branch 'asoc/topic/rt5665' into asoc-next

[karo-tx-linux.git] / drivers / gpu / drm / nouveau / nouveau_drv.h

diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
index 42c1fa53d4314f195b637c3de4323c86b095ae0f..eadec2f49ad318cf44d3464ff39dbe201e7074cb 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
@@ -86,14 +86,17 @@ enum nouveau_drm_handle {
 
 struct nouveau_cli {
        struct nvif_client base;
+       struct drm_device *dev;
+       struct mutex mutex;
+
+       struct nvif_device device;
+
        struct nvkm_vm *vm; /*XXX*/
        struct list_head head;
-       struct mutex mutex;
        void *abi16;
        struct list_head objects;
        struct list_head notifys;
        char name[32];
-       struct drm_device *dev;
 };
 
 static inline struct nouveau_cli *
@@ -111,7 +114,6 @@ struct nouveau_drm {
        struct nouveau_cli client;
        struct drm_device *dev;
 
-       struct nvif_device device;
        struct list_head clients;
 
        struct {