Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / nouveau / nv50_fbcon.c

diff --git a/drivers/gpu/drm/nouveau/nv50_fbcon.c b/drivers/gpu/drm/nouveau/nv50_fbcon.c
index 901130b0607291da4d08401f82e6ed05688c84b5..e05499d6ed8394fd2d2f8ad572d017fb29730211 100644 (file)
--- a/drivers/gpu/drm/nouveau/nv50_fbcon.c
+++ b/drivers/gpu/drm/nouveau/nv50_fbcon.c
@@ -183,7 +183,7 @@ nv50_fbcon_accel_init(struct fb_info *info)
                return -EINVAL;
        }
 
-       ret = nvif_object_init(chan->object, NULL, 0x502d, 0x502d, NULL, 0,
+       ret = nvif_object_init(&chan->user, 0x502d, 0x502d, NULL, 0,
                               &nfbdev->twod);
        if (ret)
                return ret;