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_state.c
diff --git
a/drivers/gpu/drm/nouveau/nouveau_state.c
b/drivers/gpu/drm/nouveau/nouveau_state.c
index a9e9cf35429cee993761cb2d5834ae619bb8f8f6..e1710640a2786b6051a8f305eabf9951bd699b63 100644
(file)
--- a/
drivers/gpu/drm/nouveau/nouveau_state.c
+++ b/
drivers/gpu/drm/nouveau/nouveau_state.c
@@
-24,6
+24,7
@@
*/
#include <linux/swab.h>
+#include <linux/slab.h>
#include "drmP.h"
#include "drm.h"
#include "drm_sarea.h"