diff --git a/[refs] b/[refs]
index 4de7578bc25f..e740430d8e05 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cda6be1ce27d721a88cb90543a1e6d0f41baeaa4
+refs/heads/master: 7a654158bdf9dc318fd451fbf606ed100d6ba25f
diff --git a/trunk/include/drm/drm_crtc.h b/trunk/include/drm/drm_crtc.h
index 4cc8a32dc4cf..d84fba15c9d8 100644
--- a/trunk/include/drm/drm_crtc.h
+++ b/trunk/include/drm/drm_crtc.h
@@ -256,7 +256,7 @@ struct drm_framebuffer {
 	unsigned int depth;
 	int bits_per_pixel;
 	int flags;
-	void *fbdev;
+	struct fb_info *fbdev;
 	u32 pseudo_palette[17];
 	struct list_head filp_head;
 	/* if you are using the helper */