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 'gemini_fix' of git://git.berlios.de/gemini-board into devel-stable
[sfrench/cifs-2.6.git]
/
drivers
/
gpu
/
drm
/
drm_crtc.c
diff --git
a/drivers/gpu/drm/drm_crtc.c
b/drivers/gpu/drm/drm_crtc.c
index d91fb8c0b7b31673f43b885e8b0c38b0c1b6ec50..61b9bcfdf040d134403de46acbfd592b23819cdd 100644
(file)
--- a/
drivers/gpu/drm/drm_crtc.c
+++ b/
drivers/gpu/drm/drm_crtc.c
@@
-30,6
+30,7
@@
* Jesse Barnes <jesse.barnes@intel.com>
*/
#include <linux/list.h>
+#include <linux/slab.h>
#include "drm.h"
#include "drmP.h"
#include "drm_crtc.h"