diff options
author | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2019-01-23 01:51:36 +0300 |
---|---|---|
committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2019-01-23 01:51:36 +0300 |
commit | f42fb2317ffcbd005eeb22b1e49020821a11e23a (patch) | |
tree | d89ccd0c9086c492a32da7ce4c2486c99ed3e805 /include/drm/drm_encoder_slave.h | |
parent | 25f9cebd7a52ddf15405d74fb5fd4c374f301983 (diff) | |
parent | f164a94c2c87752caeb1a3cbe068c440e7f7921f (diff) | |
download | linux-f42fb2317ffcbd005eeb22b1e49020821a11e23a.tar.xz |
Merge drm/drm-next into drm-intel-next-queued
We need avi infoframe stuff who got merged via drm-misc
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'include/drm/drm_encoder_slave.h')
-rw-r--r-- | include/drm/drm_encoder_slave.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/drm/drm_encoder_slave.h b/include/drm/drm_encoder_slave.h index 1107b4b1c599..a09864f6d684 100644 --- a/include/drm/drm_encoder_slave.h +++ b/include/drm/drm_encoder_slave.h @@ -27,7 +27,6 @@ #ifndef __DRM_ENCODER_SLAVE_H__ #define __DRM_ENCODER_SLAVE_H__ -#include <drm/drmP.h> #include <drm/drm_crtc.h> #include <drm/drm_encoder.h> |