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 drm/drm-next into drm-intel-next
[sfrench/cifs-2.6.git]
/
drivers
/
gpu
/
drm
/
i915
/
display
/
intel_display.c
diff --git
a/drivers/gpu/drm/i915/display/intel_display.c
b/drivers/gpu/drm/i915/display/intel_display.c
index 651b2309593a3ffc6335e1f8c19bd35fa985540d..458f010e46f3589f14a74d4df7b9dfa65465ecca 100644
(file)
--- a/
drivers/gpu/drm/i915/display/intel_display.c
+++ b/
drivers/gpu/drm/i915/display/intel_display.c
@@
-27,7
+27,6
@@
#include <acpi/video.h>
#include <linux/i2c.h>
#include <linux/input.h>
-#include <linux/intel-iommu.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/dma-resv.h>