From 47d96d8974ac1f69197ffc99a80c7402d192f168 Mon Sep 17 00:00:00 2001
From: Michal Januszewski <spock@gentoo.org>
Date: Mon, 13 Apr 2009 14:39:51 -0700
Subject: [PATCH] --- yaml --- r: 143197 b: refs/heads/master c:
 0a4534801468325fdb6a7b7bf73ad2a958a1e379 h: refs/heads/master i:   143195:
 0dec2ed46b5cf72fcead2428b936887a2df1685c v: v3

---
 [refs]                         |  2 +-
 trunk/drivers/video/sa1100fb.c | 15 ++++++++++-----
 trunk/drivers/video/sa1100fb.h |  7 ++++---
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 2292d772e28a..d0bec9ef302e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c26d7b29d9989cfd9004e688ad517925b0db37d0
+refs/heads/master: 0a4534801468325fdb6a7b7bf73ad2a958a1e379
diff --git a/trunk/drivers/video/sa1100fb.c b/trunk/drivers/video/sa1100fb.c
index fad58cf9ef73..10ddad8e17d6 100644
--- a/trunk/drivers/video/sa1100fb.c
+++ b/trunk/drivers/video/sa1100fb.c
@@ -199,16 +199,20 @@
 extern void (*sa1100fb_backlight_power)(int on);
 extern void (*sa1100fb_lcd_power)(int on);
 
-/*
- * IMHO this looks wrong.  In 8BPP, length should be 8.
- */
-static struct sa1100fb_rgb rgb_8 = {
+static struct sa1100fb_rgb rgb_4 = {
 	.red	= { .offset = 0,  .length = 4, },
 	.green	= { .offset = 0,  .length = 4, },
 	.blue	= { .offset = 0,  .length = 4, },
 	.transp	= { .offset = 0,  .length = 0, },
 };
 
+static struct sa1100fb_rgb rgb_8 = {
+	.red	= { .offset = 0,  .length = 8, },
+	.green	= { .offset = 0,  .length = 8, },
+	.blue	= { .offset = 0,  .length = 8, },
+	.transp	= { .offset = 0,  .length = 0, },
+};
+
 static struct sa1100fb_rgb def_rgb_16 = {
 	.red	= { .offset = 11, .length = 5, },
 	.green	= { .offset = 5,  .length = 6, },
@@ -613,7 +617,7 @@ sa1100fb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
 	DPRINTK("var->bits_per_pixel=%d\n", var->bits_per_pixel);
 	switch (var->bits_per_pixel) {
 	case 4:
-		rgbidx = RGB_8;
+		rgbidx = RGB_4;
 		break;
 	case 8:
 		rgbidx = RGB_8;
@@ -1382,6 +1386,7 @@ static struct sa1100fb_info * __init sa1100fb_init_fbinfo(struct device *dev)
 	fbi->fb.monspecs	= monspecs;
 	fbi->fb.pseudo_palette	= (fbi + 1);
 
+	fbi->rgb[RGB_4]		= &rgb_4;
 	fbi->rgb[RGB_8]		= &rgb_8;
 	fbi->rgb[RGB_16]	= &def_rgb_16;
 
diff --git a/trunk/drivers/video/sa1100fb.h b/trunk/drivers/video/sa1100fb.h
index 86831db9a042..1c3b459865d8 100644
--- a/trunk/drivers/video/sa1100fb.h
+++ b/trunk/drivers/video/sa1100fb.h
@@ -57,9 +57,10 @@ struct sa1100fb_lcd_reg {
 	unsigned long lccr3;
 };
 
-#define RGB_8	(0)
-#define RGB_16	(1)
-#define NR_RGB	2
+#define RGB_4	(0)
+#define RGB_8	(1)
+#define RGB_16	(2)
+#define NR_RGB	3
 
 struct sa1100fb_info {
 	struct fb_info		fb;