projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'v3.14.25' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
include
/
linux
/
platform_data
/
rcar-du.h
diff --git
a/include/linux/platform_data/rcar-du.h
b/include/linux/platform_data/rcar-du.h
index
1a2e990
..
a5f045e
100644
(file)
--- a/
include/linux/platform_data/rcar-du.h
+++ b/
include/linux/platform_data/rcar-du.h
@@
-14,7
+14,7
@@
#ifndef __RCAR_DU_H__
#define __RCAR_DU_H__
#ifndef __RCAR_DU_H__
#define __RCAR_DU_H__
-#include <
drm/drm_
mode.h>
+#include <
video/video
mode.h>
enum rcar_du_output {
RCAR_DU_OUTPUT_DPAD0,
enum rcar_du_output {
RCAR_DU_OUTPUT_DPAD0,
@@
-35,7
+35,7
@@
enum rcar_du_encoder_type {
struct rcar_du_panel_data {
unsigned int width_mm; /* Panel width in mm */
unsigned int height_mm; /* Panel height in mm */
struct rcar_du_panel_data {
unsigned int width_mm; /* Panel width in mm */
unsigned int height_mm; /* Panel height in mm */
- struct
drm_mode_modeinfo
mode;
+ struct
videomode
mode;
};
struct rcar_du_connector_lvds_data {
};
struct rcar_du_connector_lvds_data {