Merge tag 'drm-for-v4.15' of git://people.freedesktop.org/~airlied/linux

[linux-2.6-block.git] / drivers / gpu / drm / nouveau / include / nvif / cl826e.h

diff --git a/drivers/gpu/drm/nouveau/include/nvif/cl826e.h b/drivers/gpu/drm/nouveau/include/nvif/cl826e.h
index 36944ff09e3c6a24cb950384add06538e9a0086d..1a875090b251ddc4183b273cdcfc30382791ba58 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvif/cl826e.h
+++ b/drivers/gpu/drm/nouveau/include/nvif/cl826e.h
@@ -6,7 +6,7 @@ struct g82_channel_dma_v0 {
        __u8  version;
        __u8  chid;
        __u8  pad02[6];
-       __u64 vm;
+       __u64 vmm;
        __u64 pushbuf;
        __u64 offset;
 };