Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

1 files changed, 4 insertions, 0 deletions

diff --git a/drivers/video/p9100.c b/drivers/video/p9100.c
index 7808a01493ad..b76a5a9a125b 100644
--- a/drivers/video/p9100.c
+++ b/drivers/video/p9100.c
@@ -288,6 +288,9 @@ static void p9100_init_one(struct sbus_dev *sdev)
         all->par.physbase = sdev->reg_addrs[2].phys_addr;
 
         sbusfb_fill_var(&all->info.var, sdev->prom_node, 8);
+        all->info.var.red.length = 8;
+        all->info.var.green.length = 8;
+        all->info.var.blue.length = 8;
 
         linebytes = prom_getintdefault(sdev->prom_node, "linebytes",
                                        all->info.var.xres);
@@ -323,6 +326,7 @@ static void p9100_init_one(struct sbus_dev *sdev)
                 kfree(all);
                 return;
         }
+        fb_set_cmap(&all->info.cmap, &all->info);
 
         list_add(&all->list, &p9100_list);