diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-04-14 14:00:56 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-04-14 14:00:56 +0200 |
| commit | c5fe557ddec423afa13410fc5927bb90a7c96765 (patch) | |
| tree | 60aafcf77b46349a2bdc808aed92b7a1811cea87 /include/drm/drm_crtc.h | |
| parent | 30154650b8b58cd2633475d5a730b44baa140d98 (diff) | |
| parent | c776eb2edfce88f0a44156b417cac3da11d1f944 (diff) | |
| download | op-kernel-dev-c5fe557ddec423afa13410fc5927bb90a7c96765.zip op-kernel-dev-c5fe557ddec423afa13410fc5927bb90a7c96765.tar.gz | |
Merge branch 'topic/bxt-stage1' into drm-intel-next-queued
Separate topic branch for bxt didn't work out since we needed to
refactor the gmbus code a bit to make it look decent. So backmerge.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'include/drm/drm_crtc.h')
| -rw-r--r-- | include/drm/drm_crtc.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index ed769e7..150b93c 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h @@ -53,7 +53,6 @@ struct fence; #define DRM_MODE_OBJECT_FB 0xfbfbfbfb #define DRM_MODE_OBJECT_BLOB 0xbbbbbbbb #define DRM_MODE_OBJECT_PLANE 0xeeeeeeee -#define DRM_MODE_OBJECT_BRIDGE 0xbdbdbdbd #define DRM_MODE_OBJECT_ANY 0 struct drm_mode_object { @@ -915,7 +914,7 @@ struct drm_bridge { }; /** - * struct struct drm_atomic_state - the global state object for atomic updates + * struct drm_atomic_state - the global state object for atomic updates * @dev: parent DRM device * @allow_modeset: allow full modeset * @legacy_cursor_update: hint to enforce legacy cursor ioctl semantics |
