diff --git a/[refs] b/[refs] index b44a846e069b..0411c599fb33 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: efdc846d2f7190c8f3092c09975c0ebba30a95ba +refs/heads/master: d4787291fb9ce93f346f307c211af967d29cccad diff --git a/trunk/drivers/video/s3c-fb.c b/trunk/drivers/video/s3c-fb.c index 2e82adf9ab6d..6cbddc445f03 100644 --- a/trunk/drivers/video/s3c-fb.c +++ b/trunk/drivers/video/s3c-fb.c @@ -1434,7 +1434,6 @@ static struct s3c_fb_win_variant s3c_fb_data_64xx_wins[] __devinitdata = { }, [3] = { .has_osd_c = 1, - .has_osd_d = 1, .palette_sz = 16, .palette_16bpp = 1, .valid_bpp = (VALID_BPP124 | VALID_BPP(16) |