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 remote branch 'anholt/drm-intel-next' of /home/airlied/kernel/drm-next into...
[sfrench/cifs-2.6.git]
/
drivers
/
gpu
/
drm
/
i915
/
intel_dvo.c
diff --git
a/drivers/gpu/drm/i915/intel_dvo.c
b/drivers/gpu/drm/i915/intel_dvo.c
index 835a4cf4ee4d1ee6d3c0942fcc86329ae0f98a57..227feca7cf8dd664924b9eaa197d817e40dca6a6 100644
(file)
--- a/
drivers/gpu/drm/i915/intel_dvo.c
+++ b/
drivers/gpu/drm/i915/intel_dvo.c
@@
-25,6
+25,7
@@
* Eric Anholt <eric@anholt.net>
*/
#include <linux/i2c.h>
+#include <linux/slab.h>
#include "drmP.h"
#include "drm.h"
#include "drm_crtc.h"