git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[safe/jmp/linux-2.6]
/
drivers
/
gpu
/
drm
/
radeon
/
r420.c
diff --git
a/drivers/gpu/drm/radeon/r420.c
b/drivers/gpu/drm/radeon/r420.c
index
100af65
..
c2bda4a
100644
(file)
--- a/
drivers/gpu/drm/radeon/r420.c
+++ b/
drivers/gpu/drm/radeon/r420.c
@@
-26,6
+26,7
@@
* Jerome Glisse
*/
#include <linux/seq_file.h>
+#include <linux/slab.h>
#include "drmP.h"
#include "radeon_reg.h"
#include "radeon.h"