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 'drm-ttm-unmappable' into drm-core-next
[pandora-kernel.git]
/
drivers
/
gpu
/
drm
/
i830
/
i830_dma.c
diff --git
a/drivers/gpu/drm/i830/i830_dma.c
b/drivers/gpu/drm/i830/i830_dma.c
index
06bd732
..
65759a9
100644
(file)
--- a/
drivers/gpu/drm/i830/i830_dma.c
+++ b/
drivers/gpu/drm/i830/i830_dma.c
@@
-38,6
+38,7
@@
#include <linux/interrupt.h> /* For task queue support */
#include <linux/pagemap.h>
#include <linux/delay.h>
+#include <linux/slab.h>
#include <asm/uaccess.h>
#define I830_BUF_FREE 2