diff options
| author | Jerome Glisse <glisse@freedesktop.org> | 2008-11-05 15:59:37 +0100 |
|---|---|---|
| committer | Jerome Glisse <glisse@freedesktop.org> | 2008-11-05 15:59:37 +0100 |
| commit | ddfb12b32e64d00d302f7fbb36fb079deec3646f (patch) | |
| tree | 5caeade40ef88936a88e47060b6090aa44d38b94 /linux-core/drm_crtc_helper.c | |
| parent | 7651b4c424aa6c6ac6c47b2d07c8f65d0b9d0191 (diff) | |
| parent | 68fcb7770efc20b9e27b1724e2fb5ac112a5330e (diff) | |
Merge branch 'modesetting-gem' of ssh://git.freedesktop.org/git/mesa/drm into modesetting-gem
Diffstat (limited to 'linux-core/drm_crtc_helper.c')
| -rw-r--r-- | linux-core/drm_crtc_helper.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/linux-core/drm_crtc_helper.c b/linux-core/drm_crtc_helper.c index b334f5b5..776a98e1 100644 --- a/linux-core/drm_crtc_helper.c +++ b/linux-core/drm_crtc_helper.c @@ -771,15 +771,13 @@ int drm_helper_hotplug_stage_two(struct drm_device *dev) EXPORT_SYMBOL(drm_helper_hotplug_stage_two); int drm_helper_mode_fill_fb_struct(struct drm_framebuffer *fb, - struct drm_mode_fb_cmd *mode_cmd, - void *mm_private) + struct drm_mode_fb_cmd *mode_cmd) { fb->width = mode_cmd->width; fb->height = mode_cmd->height; fb->pitch = mode_cmd->pitch; fb->bits_per_pixel = mode_cmd->bpp; fb->depth = mode_cmd->depth; - fb->mm_private = mm_private; return 0; } |