diff options
| author |   Dave Airlie <airlied@redhat.com> | 2014-09-17 19:55:19 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-09-18 21:53:47 +1000 |
| commit | 8337486a8fda53e5f46b3cb2b4eb3272608348cb (patch) | |
| tree | d5dea7742b6335be4a78de8a788d00c23706fb82 /include/linux/platform_data | |
| parent | drm/ttm: make sure format string cannot leak in (diff) | |
| parent | drm/rcar-du: Add OF support (diff) | |
| download | linux-dev-8337486a8fda53e5f46b3cb2b4eb3272608348cb.tar.xz linux-dev-8337486a8fda53e5f46b3cb2b4eb3272608348cb.zip | |
Merge branch 'drm/next/du' of git://linuxtv.org/pinchartl/fbdev into drm-next
Commit "drm/rcar-du: Use struct videomode in platform data" touches board code
in arch/arm/mach-shmobile. There is, to the best of my knowledge, no risk of
conflict for v3.18. Simon, are you fine with getting those changes merged
through Dave's tree (and could you confirm that no conflict should occur) ?
Simon acked the merge:
Acked-by: Simon Horman <horms+renesas@verge.net.au>
* 'drm/next/du' of git://linuxtv.org/pinchartl/fbdev:
drm/rcar-du: Add OF support
drm/rcar-du: Use struct videomode in platform data
video: Add DT bindings for the R-Car Display Unit
video: Add THC63LVDM83D DT bindings documentation
video: Add ADV7123 DT bindings documentation
video: Add DT binding documentation for VGA connector
devicetree: Add vendor prefix "thine" to vendor-prefixes.txt
devicetree: Add vendor prefix "mitsubishi" to vendor-prefixes.txt
drm/shmob: Update copyright notice
drm/rcar-du: Update copyright notice
Diffstat (limited to 'include/linux/platform_data')
| -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 { |