diff --git a/[refs] b/[refs]
index 618ca773ecc9..4c6be0bf590d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 353076fee81318d056c7a853b1bf6ad1f81d050d
+refs/heads/master: d2fa9e05e3876198d8ab31624fe84512a0a44b45
diff --git a/trunk/drivers/video/ffb.c b/trunk/drivers/video/ffb.c
index 1d4e8354b561..3f6c98fad437 100644
--- a/trunk/drivers/video/ffb.c
+++ b/trunk/drivers/video/ffb.c
@@ -656,7 +656,7 @@ static int ffb_setcolreg(unsigned regno,
 {
 	u32 value;
 
-	if (regno >= 256)
+	if (regno >= 16)
 		return 1;
 
 	red >>= 8;
@@ -903,7 +903,7 @@ ffb_init_fix(struct fb_info *info)
 struct all_info {
 	struct fb_info info;
 	struct ffb_par par;
-	u32 pseudo_palette[256];
+	u32 pseudo_palette[16];
 };
 
 static int ffb_init_one(struct of_device *op)