diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-10-09 13:44:08 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-10-09 13:44:08 +1100 |
| commit | 32ba738cf74392652ac84f837016d5509a09f75d (patch) | |
| tree | fd8eea316c577c342e3a810888714cade38d733f /include/linux | |
| parent | eae9d3ff846cf82612a0a730b15a73d6cf0ad8e4 (diff) | |
| parent | 1e99cfa8de0f0879091e33cd65fd60418d006ad9 (diff) | |
Merge remote-tracking branch 'drm/drm-next'
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/platform_data/rcar-du.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/platform_data/rcar-du.h b/include/linux/platform_data/rcar-du.h index 1a2e9901a22e..a5f045e1d8fe 100644 --- 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__ -#include <drm/drm_mode.h> +#include <video/videomode.h> 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 drm_mode_modeinfo mode; + struct videomode mode; }; struct rcar_du_connector_lvds_data { |