Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[linux-2.6-block.git] / drivers / gpu / drm / drm_fb_cma_helper.c

diff --git a/drivers/gpu/drm/drm_fb_cma_helper.c b/drivers/gpu/drm/drm_fb_cma_helper.c
index c895b6fddbd818052335dff264cfe9685fc3af67..bb88e3df925712e52af66869e4a23563221dc36c 100644 (file)
--- a/drivers/gpu/drm/drm_fb_cma_helper.c
+++ b/drivers/gpu/drm/drm_fb_cma_helper.c
@@ -74,7 +74,8 @@ static struct drm_framebuffer_funcs drm_fb_cma_funcs = {
 };
 
 static struct drm_fb_cma *drm_fb_cma_alloc(struct drm_device *dev,
-       const const struct drm_mode_fb_cmd2 *mode_cmd, struct drm_gem_cma_object **obj,
+       const struct drm_mode_fb_cmd2 *mode_cmd,
+       struct drm_gem_cma_object **obj,
        unsigned int num_planes)
 {
        struct drm_fb_cma *fb_cma;