From 2aa3f39f76106696225cf8d23f5183c348d98d19 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Tue, 31 May 2011 11:12:55 +1000 Subject: [PATCH] --- yaml --- r: 260109 b: refs/heads/master c: f8656f0baa316d1f08e224248e0b40ade85a4e80 h: refs/heads/master i: 260107: 67b923174d4fd2834560f04d7100dadf8b5d2f4c v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_state.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 62f88929c971..39abe57581e2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3f0a68d8f8ba9d6c0cd9df948fbba90944c3da62 +refs/heads/master: f8656f0baa316d1f08e224248e0b40ade85a4e80 diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_state.c b/trunk/drivers/gpu/drm/nouveau/nouveau_state.c index 9aa96b9375ae..9965063beb69 100644 --- a/trunk/drivers/gpu/drm/nouveau/nouveau_state.c +++ b/trunk/drivers/gpu/drm/nouveau/nouveau_state.c @@ -449,8 +449,8 @@ nouveau_card_init_channel(struct drm_device *dev) struct drm_nouveau_private *dev_priv = dev->dev_private; int ret; - ret = nouveau_channel_alloc(dev, &dev_priv->channel, - (struct drm_file *)-2, NvDmaFB, NvDmaTT); + ret = nouveau_channel_alloc(dev, &dev_priv->channel, NULL, + NvDmaFB, NvDmaTT); if (ret) return ret;