git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-torvalds' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...
[pandora-kernel.git]
/
drivers
/
gpu
/
drm
/
nouveau
/
nouveau_dma.c
diff --git
a/drivers/gpu/drm/nouveau/nouveau_dma.c
b/drivers/gpu/drm/nouveau/nouveau_dma.c
index
ce38e97
..
568caed
100644
(file)
--- a/
drivers/gpu/drm/nouveau/nouveau_dma.c
+++ b/
drivers/gpu/drm/nouveau/nouveau_dma.c
@@
-83,7
+83,7
@@
nouveau_dma_init(struct nouveau_channel *chan)
return ret;
/* NV_MEMORY_TO_MEMORY_FORMAT requires a notifier object */
- ret = nouveau_notifier_alloc(chan, NvNotify0, 32, 0xf
d
0, 0x1000,
+ ret = nouveau_notifier_alloc(chan, NvNotify0, 32, 0xf
e
0, 0x1000,
&chan->m2mf_ntfy);
if (ret)
return ret;