Merge branch 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm

[cascardo/linux.git] / drivers / gpu / drm / exynos / exynos_drm_drv.h

diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.h b/drivers/gpu/drm/exynos/exynos_drm_drv.h
index b39d521..7f1a49d 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_drm_drv.h
+++ b/drivers/gpu/drm/exynos/exynos_drm_drv.h
@@ -64,7 +64,6 @@ struct exynos_drm_plane_state {
        struct exynos_drm_rect src;
        unsigned int h_ratio;
        unsigned int v_ratio;
-       unsigned int zpos;
 };
 
 static inline struct exynos_drm_plane_state *
@@ -221,7 +220,6 @@ struct exynos_drm_private {
         * this array is used to be aware of which crtc did it request vblank.
         */
        struct drm_crtc *crtc[MAX_CRTC];
-       struct drm_property *plane_zpos_property;
 
        struct device *dma_dev;
        void *mapping;