Merge commit 'v3.4-rc4' into next

1 files changed, 0 insertions, 2 deletions

diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h
index 6e3076ad646e..5120b01c2eeb 100644
--- a/include/drm/drm_fb_helper.h
+++ b/include/drm/drm_fb_helper.h
@@ -35,7 +35,6 @@ struct drm_fb_helper;
 #include <linux/kgdb.h>
 
 struct drm_fb_helper_crtc {
-        uint32_t crtc_id;
         struct drm_mode_set mode_set;
         struct drm_display_mode *desired_mode;
 };
@@ -74,7 +73,6 @@ struct drm_fb_helper {
         int connector_count;
         struct drm_fb_helper_connector **connector_info;
         struct drm_fb_helper_funcs *funcs;
-        int conn_limit;
         struct fb_info *fbdev;
         u32 pseudo_palette[17];
         struct list_head kernel_fb_list;