diff options
| author | Eric Anholt <eric@anholt.net> | 2008-07-28 15:17:21 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2008-07-28 23:12:26 -0700 |
| commit | 1d2bb68d28fe39746299ee8ddb664a62de839b0c (patch) | |
| tree | f1f89d0ea693a0520f4e856296c4d3d4d721501f /shared-core/nouveau_notifier.c | |
| parent | 487c42bd42d93304278abce03b36c935bdc83284 (diff) | |
| parent | 514c05cebe31a62f827a76f348d35596bef97811 (diff) | |
Merge commit 'origin/master' into drm-gem
Conflicts:
linux-core/Makefile.kernel
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
Diffstat (limited to 'shared-core/nouveau_notifier.c')
| -rw-r--r-- | shared-core/nouveau_notifier.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/shared-core/nouveau_notifier.c b/shared-core/nouveau_notifier.c index 82c8ab7d..edece4da 100644 --- a/shared-core/nouveau_notifier.c +++ b/shared-core/nouveau_notifier.c @@ -94,7 +94,7 @@ nouveau_notifier_alloc(struct nouveau_channel *chan, uint32_t handle, } mem = nouveau_mem_alloc_block(chan->notifier_heap, count*32, 0, - (struct drm_file *)-2); + (struct drm_file *)-2, 0); if (!mem) { DRM_ERROR("Channel %d notifier block full\n", chan->id); return -ENOMEM; |