diff --git a/[refs] b/[refs] index 0901b4f8c88b..ed2fb9fa1252 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 12e572d90c0868be9d3158325da7ccd5cb91c2cd +refs/heads/master: c9d503e93562e1de093ff16a480fc8801cfa70d9 diff --git a/trunk/drivers/video/s3c-fb.c b/trunk/drivers/video/s3c-fb.c index d570e588f40a..88c373d9f274 100644 --- a/trunk/drivers/video/s3c-fb.c +++ b/trunk/drivers/video/s3c-fb.c @@ -1633,7 +1633,7 @@ static struct s3c_fb_win_variant s3c_fb_data_64xx_wins[] = { [1] = { .has_osd_c = 1, .has_osd_d = 1, - .osd_size_off = 0x12, + .osd_size_off = 0xc, .has_osd_alpha = 1, .palette_sz = 256, .valid_bpp = (VALID_BPP1248 | VALID_BPP(16) | @@ -1643,7 +1643,7 @@ static struct s3c_fb_win_variant s3c_fb_data_64xx_wins[] = { [2] = { .has_osd_c = 1, .has_osd_d = 1, - .osd_size_off = 0x12, + .osd_size_off = 0xc, .has_osd_alpha = 1, .palette_sz = 16, .palette_16bpp = 1,