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 / nvc0_fbcon.c

diff --git a/drivers/gpu/drm/nouveau/nvc0_fbcon.c b/drivers/gpu/drm/nouveau/nvc0_fbcon.c
index fcd2e5f27bb9539ba113e790222713b10127f825..c97395b4a312493aa066e409144b30c682b2a5ae 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvc0_fbcon.c
+++ b/drivers/gpu/drm/nouveau/nvc0_fbcon.c
@@ -156,7 +156,7 @@ nvc0_fbcon_accel_init(struct fb_info *info)
        struct nouveau_channel *chan = drm->channel;
        int ret, format;
 
-       ret = nvif_object_init(chan->object, NULL, 0x902d, 0x902d, NULL, 0,
+       ret = nvif_object_init(&chan->user, 0x902d, 0x902d, NULL, 0,
                               &nfbdev->twod);
        if (ret)
                return ret;