diff options
author | 2017-11-13 17:10:13 -0800 | |
---|---|---|
committer | 2017-11-13 17:10:13 -0800 | |
commit | c25141062a82ae8bddced1b3ce2b57a1c0efabe0 (patch) | |
tree | 105edf10059bc0c4f2f00338b0c861b813d1bb1a /drivers/gpu/drm/imx/imx-ldb.c | |
parent | Input: synaptics-rmi4 - RMI4 can also use SMBUS version 3 (diff) | |
parent | Input: gamecon - mark expected switch fall-throughs (diff) | |
download | linux-dev-c25141062a82ae8bddced1b3ce2b57a1c0efabe0.tar.xz linux-dev-c25141062a82ae8bddced1b3ce2b57a1c0efabe0.zip |
Merge branch 'next' into for-linus
Prepare input updates for 4.15 merge window.
Diffstat (limited to 'drivers/gpu/drm/imx/imx-ldb.c')
-rw-r--r-- | drivers/gpu/drm/imx/imx-ldb.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/imx/imx-ldb.c b/drivers/gpu/drm/imx/imx-ldb.c index 8b05ecb8fdef..56dd7a9a8e25 100644 --- a/drivers/gpu/drm/imx/imx-ldb.c +++ b/drivers/gpu/drm/imx/imx-ldb.c @@ -389,7 +389,6 @@ static int imx_ldb_encoder_atomic_check(struct drm_encoder *encoder, static const struct drm_connector_funcs imx_ldb_connector_funcs = { - .dpms = drm_atomic_helper_connector_dpms, .fill_modes = drm_helper_probe_single_connector_modes, .destroy = imx_drm_connector_destroy, .reset = drm_atomic_helper_connector_reset, |