projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
[linux-2.6-block.git]
/
drivers
/
gpu
/
drm
/
nouveau
/
nouveau_sgdma.c
diff --git
a/drivers/gpu/drm/nouveau/nouveau_sgdma.c
b/drivers/gpu/drm/nouveau/nouveau_sgdma.c
index 554fb45730c186e7a84021cb5148dd440060a271..1d6ee8b55154c95aa763ed278c31b14da32fa9a7 100644
(file)
--- a/
drivers/gpu/drm/nouveau/nouveau_sgdma.c
+++ b/
drivers/gpu/drm/nouveau/nouveau_sgdma.c
@@
-1,6
+1,7
@@
#include "drmP.h"
#include "nouveau_drv.h"
#include <linux/pagemap.h>
+#include <linux/slab.h>
#define NV_CTXDMA_PAGE_SHIFT 12
#define NV_CTXDMA_PAGE_SIZE (1 << NV_CTXDMA_PAGE_SHIFT)