From: Pawel Osciak <p.osciak@samsung.com>
Date: Wed, 11 Aug 2010 01:02:39 +0000 (-0700)
Subject: s3c-fb: window 3 of 64xx+ does not have an osd_d register
X-Git-Tag: v2.6.36-rc1~172
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d4787291fb9ce93f346f307c211af967d29cccad;p=users%2Fhch%2Fconfigfs.git

s3c-fb: window 3 of 64xx+ does not have an osd_d register

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>
---

diff --git a/drivers/video/s3c-fb.c b/drivers/video/s3c-fb.c
index 2e82adf9ab6d..6cbddc445f03 100644
--- a/drivers/video/s3c-fb.c
+++ b/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) |