Merge branch 'smack-for-3.19' of git://git.gitorious.org/smack-next/kernel into next

[cascardo/linux.git] / drivers / gpu / drm / nouveau / nouveau_abi16.h

diff --git a/drivers/gpu/drm/nouveau/nouveau_abi16.h b/drivers/gpu/drm/nouveau/nouveau_abi16.h
index 9000408..39844e6 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_abi16.h
+++ b/drivers/gpu/drm/nouveau/nouveau_abi16.h
@@ -28,8 +28,7 @@ struct nouveau_abi16_chan {
 };
 
 struct nouveau_abi16 {
-       struct nouveau_object *client;
-       struct nouveau_object *device;
+       struct nvif_device device;
        struct list_head channels;
        u64 handles;
 };