summaryrefslogtreecommitdiffstats
path: root/include/drm/drm_crtc.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2015-08-24 16:36:42 +1000
committerDave Airlie <airlied@redhat.com>2015-08-24 16:36:42 +1000
commit3732ce72b45a2a145803558758821bf198751276 (patch)
tree75047ed1f43cfd56231535c401924dbb27c4d0f0 /include/drm/drm_crtc.h
parente829d7ef9f17d7b84d4c3d110ecd4b7b2bcba865 (diff)
parentc13dcf9f2d6f5f06ef1bf79ec456df614c5e058b (diff)
downloadtalos-obmc-linux-3732ce72b45a2a145803558758821bf198751276.tar.gz
talos-obmc-linux-3732ce72b45a2a145803558758821bf198751276.zip
Merge tag 'v4.2-rc8' into drm-next
Linux 4.2-rc8 Backmerge required for Intel so they can fix their -next tree up properly.
Diffstat (limited to 'include/drm/drm_crtc.h')
-rw-r--r--include/drm/drm_crtc.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index 6e5afc30b596..faaeff7db684 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -745,8 +745,6 @@ struct drm_connector {
uint8_t num_h_tile, num_v_tile;
uint8_t tile_h_loc, tile_v_loc;
uint16_t tile_h_size, tile_v_size;
-
- struct list_head destroy_list;
};
/**
OpenPOWER on IntegriCloud