diff --git a/[refs] b/[refs]
index d373b7f8b4b1..5fad7d224785 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 372166af0bd226322debf420a417524634a56abf
+refs/heads/master: c312f97df65bf38a8e7f664b76154639f593775d
diff --git a/trunk/drivers/video/intelfb/intelfb.h b/trunk/drivers/video/intelfb/intelfb.h
index 80b94c19a9fa..6148300fadd6 100644
--- a/trunk/drivers/video/intelfb/intelfb.h
+++ b/trunk/drivers/video/intelfb/intelfb.h
@@ -302,7 +302,7 @@ struct intelfb_info {
 	u32 ring_lockup;
 
 	/* palette */
-	u32 pseudo_palette[17];
+	u32 pseudo_palette[16];
 
 	/* chip info */
 	int pci_chipset;