git.samba.org
/
sfrench
/
cifs-2.6.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
[sfrench/cifs-2.6.git]
/
drivers
/
gpu
/
drm
/
radeon
/
radeon_object.c
diff --git
a/drivers/gpu/drm/radeon/radeon_object.c
b/drivers/gpu/drm/radeon/radeon_object.c
index 57b3f95c0efae878ec801f84c29112fd4ef84083..6a8617bac1429400105b626d796f86029f7c132d 100644
(file)
--- a/
drivers/gpu/drm/radeon/radeon_object.c
+++ b/
drivers/gpu/drm/radeon/radeon_object.c
@@
-30,6
+30,7
@@
* Dave Airlie
*/
#include <linux/list.h>
+#include <linux/slab.h>
#include <drm/drmP.h>
#include "radeon_drm.h"
#include "radeon.h"