Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/scsi/fcoe/fcoe.c

1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/video/sa1100fb.h b/drivers/video/sa1100fb.h
index 86831db9a042..1c3b459865d8 100644
--- a/drivers/video/sa1100fb.h
+++ b/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;