From a6895d5049aa39476ad2b8354278bf5a89b98454 Mon Sep 17 00:00:00 2001
From: "Antonino A. Daplas" <adaplas@gmail.com>
Date: Tue, 17 Jul 2007 04:05:35 -0700
Subject: [PATCH] --- yaml --- r: 60898 b: refs/heads/master c:
 11494543a5775b4764d0172084092715a533a8ce h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/video/controlfb.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index fd963cb46185..cbf95defa80c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5a17759c98c814520da653133ccfbb8d2c50cd6c
+refs/heads/master: 11494543a5775b4764d0172084092715a533a8ce
diff --git a/trunk/drivers/video/controlfb.c b/trunk/drivers/video/controlfb.c
index 8b762739b1e0..b0be7eac32d8 100644
--- a/trunk/drivers/video/controlfb.c
+++ b/trunk/drivers/video/controlfb.c
@@ -94,7 +94,7 @@ static inline int VAR_MATCH(struct fb_var_screeninfo *x, struct fb_var_screeninf
 struct fb_info_control {
 	struct fb_info		info;
 	struct fb_par_control	par;
-	u32			pseudo_palette[17];
+	u32			pseudo_palette[16];
 		
 	struct cmap_regs	__iomem *cmap_regs;
 	unsigned long		cmap_regs_phys;