---

yaml --- r: 293622 b: refs/heads/master c: 4f988d1 h: refs/heads/master v: v3
git-mirror · Feb 3, 2012 · c635d5c · c635d5c
1 parent 72777e2
commit c635d5c
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e9ad318128aa858f713d6f2c4623f7583ca53a71
+refs/heads/master: 4f988d132d2668b4f3b42bfc70daa531115ccca1
diff --git a/trunk/drivers/gpu/drm/drm_fb_helper.c b/trunk/drivers/gpu/drm/drm_fb_helper.c
@@ -417,7 +417,6 @@ int drm_fb_helper_init(struct drm_device *dev,
 
 	i = 0;
 	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
-		fb_helper->crtc_info[i].crtc_id = crtc->base.id;
 		fb_helper->crtc_info[i].mode_set.crtc = crtc;
 		i++;
 	}

diff --git a/trunk/include/drm/drm_fb_helper.h b/trunk/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;
 };
-Original file line number
+Diff line change
@@ Expand Up / @@ -417,7 +417,6 @@ int drm_fb_helper_init(struct drm_device *dev, @@
     	i = 0;
     	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
-    		fb_helper->crtc_info[i].crtc_id = crtc->base.id;
     		fb_helper->crtc_info[i].mode_set.crtc = crtc;
     		i++;
     	}
@@ Expand Down @@