Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / drivers / gpu / drm / drm_fb_helper.c

diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index 035784ddd13363eec627425cf7e6a2600b9b7469..0646b108030ba5d1d41040af3fffa7386be7853d 100644 (file)
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -1351,7 +1351,7 @@ static struct drm_property_blob *setcmap_new_gamma_lut(struct drm_crtc *crtc,
        if (IS_ERR(gamma_lut))
                return gamma_lut;
 
-       lut = (struct drm_color_lut *)gamma_lut->data;
+       lut = gamma_lut->data;
        if (cmap->start || cmap->len != size) {
                u16 *r = crtc->gamma_store;
                u16 *g = r + crtc->gamma_size;