From: Dave Airlie <airlied@redhat.com>
Date: Thu, 18 Jun 2015 02:55:03 +0000 (+1000)
Subject: Merge tag 'drm/panel/for-4.2-rc1' of git://anongit.freedesktop.org/tegra/linux into... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2aeab6884b77459029f37a1d7f741a296e5c3f5f;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge tag 'drm/panel/for-4.2-rc1' of git://anongit.freedesktop.org/tegra/linux into drm-next

drm/panel: Changes for v4.2-rc1

This contains fixes for the long-standing build issues that some of the
bridge drivers were exposing. Other than that it's mostly cleanup and a
couple of new simple panels that are supported.

* tag 'drm/panel/for-4.2-rc1' of git://anongit.freedesktop.org/tegra/linux:
  drm/panel: simple: Add bus format for HannStar HSD100PXN1
  drm/panel: simple: Add display timing for HannStar HSD100PXN1
  drm/panel: ld9040: Remove useless padding
  drm/panel: Constify OF match tables
  drm/bridge: Remove stale ptn3460.h include
  drm/bridge: ps8622: Include linux/gpio/consumer.h
  drm/bridge: ptn3460: Include linux/gpio/consumer.h
  drm/bridge: dw-hdmi: Return number of EDID modes
  drm/panel: simple: Add support for LG LB070WV8 800x480 7" panel
  drm/bridge: ptn3460: Pass flags to devm_gpiod_get()
  drm/bridge: ps8622: Pass flags to devm_gpiod_get()
  drm/bridge: ptn3460: Fix I2C ID table to match the reported modalias
  drm/bridge: dw-hdmi: Staticize dw_hdmi_bridge_funcs
---

2aeab6884b77459029f37a1d7f741a296e5c3f5f
diff --cc drivers/gpu/drm/exynos/exynos_dp_core.c
index 30feb7d06624,b178f530391f..15b0865ecf97
--- a/drivers/gpu/drm/exynos/exynos_dp_core.c
+++ b/drivers/gpu/drm/exynos/exynos_dp_core.c
@@@ -29,9 -29,9 +29,8 @@@
  #include <drm/drm_crtc.h>
  #include <drm/drm_crtc_helper.h>
  #include <drm/drm_panel.h>
- #include <drm/bridge/ptn3460.h>
  
  #include "exynos_dp_core.h"
 -#include "exynos_drm_fimd.h"
  
  #define ctx_from_connector(c)	container_of(c, struct exynos_dp_device, \
  					connector)