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-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
[sfrench/cifs-2.6.git]
/
drivers
/
gpu
/
drm
/
radeon
/
atom.c
diff --git
a/drivers/gpu/drm/radeon/atom.c
b/drivers/gpu/drm/radeon/atom.c
index 58845e053b368197139639c9744c0f784c346b9f..bcec2d79636e3d425ca9eca14e33d993ff32e484 100644
(file)
--- a/
drivers/gpu/drm/radeon/atom.c
+++ b/
drivers/gpu/drm/radeon/atom.c
@@
-24,6
+24,7
@@
#include <linux/module.h>
#include <linux/sched.h>
+#include <linux/slab.h>
#include <asm/unaligned.h>
#define ATOM_DEBUG