projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Backmerge tag 'v4.7' into drm-next
[cascardo/linux.git]
/
arch
/
arm
/
mach-omap2
/
dss-common.c
diff --git
a/arch/arm/mach-omap2/dss-common.c
b/arch/arm/mach-omap2/dss-common.c
index
ea2be0f
..
1d583bc
100644
(file)
--- a/
arch/arm/mach-omap2/dss-common.c
+++ b/
arch/arm/mach-omap2/dss-common.c
@@
-27,7
+27,7
@@
#include <linux/gpio.h>
#include <linux/platform_device.h>
-#include <
video
/omapdss.h>
+#include <
linux/platform_data
/omapdss.h>
#include <video/omap-panel-data.h>
#include "soc.h"