projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'powerpc-4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...
[cascardo/linux.git]
/
drivers
/
gpu
/
drm
/
omapdrm
/
displays
/
connector-hdmi.c
diff --git
a/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
b/drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
index
667ca4a
..
7bdf83a
100644
(file)
--- a/
drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
+++ b/
drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
@@
-17,10
+17,10
@@
#include <linux/of_gpio.h>
#include <drm/drm_edid.h>
-
-#include <video/omapdss.h>
#include <video/omap-panel-data.h>
+#include "../dss/omapdss.h"
+
static const struct omap_video_timings hdmic_default_timings = {
.x_res = 640,
.y_res = 480,