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 git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
[sfrench/cifs-2.6.git]
/
drivers
/
gpu
/
drm
/
drm_pci.c
diff --git
a/drivers/gpu/drm/drm_pci.c
b/drivers/gpu/drm/drm_pci.c
index e68ebf92fa2a5187c0e6b56a5e089a26d0516da2..2ea9ad4a8d699847bb4e8a7d0f1e7dc58ace90e4 100644
(file)
--- a/
drivers/gpu/drm/drm_pci.c
+++ b/
drivers/gpu/drm/drm_pci.c
@@
-37,6
+37,7
@@
*/
#include <linux/pci.h>
+#include <linux/slab.h>
#include <linux/dma-mapping.h>
#include "drmP.h"