git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote branch 'origin/drm-core-next' into test
[pandora-kernel.git]
/
drivers
/
gpu
/
drm
/
i915
/
intel_display.c
diff --git
a/drivers/gpu/drm/i915/intel_display.c
b/drivers/gpu/drm/i915/intel_display.c
index
099f420
..
8972308
100644
(file)
--- a/
drivers/gpu/drm/i915/intel_display.c
+++ b/
drivers/gpu/drm/i915/intel_display.c
@@
-32,7
+32,7
@@
#include "intel_drv.h"
#include "i915_drm.h"
#include "i915_drv.h"
-#include "
intel_dp
.h"
+#include "
drm_dp_helper
.h"
#include "drm_crtc_helper.h"