drm/fb: fix fbdev object model + cleanup properly.

[net-next-2.6.git] / include / drm / drm_crtc.h

diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index 1347524a8e30e296da51b61b4f35e10e1708e56b..c70814b184e8e1403d03941b183aaec5db912dc9 100644 (file)
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -271,8 +271,6 @@ struct drm_framebuffer {
        unsigned int depth;
        int bits_per_pixel;
        int flags;
-       struct fb_info *fbdev;
-       u32 pseudo_palette[17];
        struct list_head filp_head;
        /* if you are using the helper */
        void *helper_private;
@@ -548,16 +546,9 @@ struct drm_mode_set {
 
 /**
  * struct drm_mode_config_funcs - configure CRTCs for a given screen layout
- * @resize: adjust CRTCs as necessary for the proposed layout
- *
- * Currently only a resize hook is available.  DRM will call back into the
- * driver with a new screen width and height.  If the driver can't support
- * the proposed size, it can return false.  Otherwise it should adjust
- * the CRTC<->connector mappings as needed and update its view of the screen.
  */
 struct drm_mode_config_funcs {
        struct drm_framebuffer *(*fb_create)(struct drm_device *dev, struct drm_file *file_priv, struct drm_mode_fb_cmd *mode_cmd);
-       int (*fb_changed)(struct drm_device *dev);
 };
 
 struct drm_mode_group {
@@ -590,9 +581,6 @@ struct drm_mode_config {
 
        struct list_head property_list;
 
-       /* in-kernel framebuffers - hung of filp_head in drm_framebuffer */
-       struct list_head fb_kernel_list;
-
        int min_width, min_height;
        int max_width, max_height;
        struct drm_mode_config_funcs *funcs;