drm/armada: make variant a CRTC thing

[pandora-kernel.git] / drivers / gpu / drm / armada / armada_drm.h

diff --git a/drivers/gpu/drm/armada/armada_drm.h b/drivers/gpu/drm/armada/armada_drm.h
index a5452ae..ea63c6c 100644 (file)
--- a/drivers/gpu/drm/armada/armada_drm.h
+++ b/drivers/gpu/drm/armada/armada_drm.h
@@ -61,17 +61,16 @@ struct armada_private;
 struct armada_variant {
        bool has_spu_adv_reg;
        uint32_t spu_adv_reg;
-       int (*crtc_init)(struct armada_crtc *, struct device *);
-       int (*crtc_compute_clock)(struct armada_crtc *,
-                                 const struct drm_display_mode *,
-                                 uint32_t *);
+       int (*init)(struct armada_crtc *, struct device *);
+       int (*compute_clock)(struct armada_crtc *,
+                            const struct drm_display_mode *,
+                            uint32_t *);
 };
 
 /* Variant ops */
 extern const struct armada_variant armada510_ops;
 
 struct armada_private {
-       const struct armada_variant *variant;
        struct work_struct      fb_unref_work;
        DECLARE_KFIFO(fb_unref, struct drm_framebuffer *, 8);
        struct drm_fb_helper    *fbdev;