Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

[powerpc.git] / drivers / video / amba-clcd.c

diff --git a/drivers/video/amba-clcd.c b/drivers/video/amba-clcd.c
index 3e386fd..321dbe9 100644 (file)
--- a/drivers/video/amba-clcd.c
+++ b/drivers/video/amba-clcd.c
@@ -134,16 +134,16 @@ clcdfb_set_bitfields(struct clcd_fb *fb, struct fb_var_screeninfo *var)
                break;
        case 16:
                var->red.length         = 5;
-               var->green.length       = 5;
+               var->green.length       = 6;
                var->blue.length        = 5;
                if (fb->panel->cntl & CNTL_BGR) {
-                       var->red.offset         = 10;
+                       var->red.offset         = 11;
                        var->green.offset       = 5;
                        var->blue.offset        = 0;
                } else {
                        var->red.offset         = 0;
                        var->green.offset       = 5;
-                       var->blue.offset        = 10;
+                       var->blue.offset        = 11;
                }
                break;
        case 32:
@@ -256,7 +256,7 @@ clcdfb_setcolreg(unsigned int regno, unsigned int red, unsigned int green,
                                  convert_bitfield(green, &fb->fb.var.green) |
                                  convert_bitfield(red, &fb->fb.var.red);
 
-       if (fb->fb.var.bits_per_pixel == 8 && regno < 256) {
+       if (fb->fb.fix.visual == FB_VISUAL_PSEUDOCOLOR && regno < 256) {
                int hw_reg = CLCD_PALETTE + ((regno * 2) & ~3);
                u32 val, mask, newval;