]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
s3c-fb: window 3 of 64xx+ does not have an osd_d register
authorPawel Osciak <p.osciak@samsung.com>
Wed, 11 Aug 2010 01:02:39 +0000 (18:02 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 11 Aug 2010 15:59:11 +0000 (08:59 -0700)
Signed-off-by: Pawel Osciak <p.osciak@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Cc: InKi Dae <inki.dae@samsung.com>
Cc: Ben Dooks <ben-linux@fluff.org>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/video/s3c-fb.c

index 2e82adf9ab6d7c9c22e548d74e303aa8e8e4ef40..6cbddc445f03126c72458a478df357eb27c064c3 100644 (file)
@@ -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) |