diff options
author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-30 15:42:33 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-30 15:42:33 -0700 |
commit | 1d651f3332340c232ff66b7f5bab66cb8903859f (patch) | |
tree | 99c47c498867ff5ee2fe0845622f4d1c4e1df1f4 /drivers/video | |
parent | Merge of master.kernel.org:/home/rmk/linux-2.6-rmk.git (diff) | |
parent | [PATCH] ARM: IntegratorCP: Fix CLCD MUX selection values (diff) | |
download | linux-dev-1d651f3332340c232ff66b7f5bab66cb8903859f.tar.xz linux-dev-1d651f3332340c232ff66b7f5bab66cb8903859f.zip |
Merge of master.kernel.org:/home/rmk/linux-2.6-rmk.git
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/amba-clcd.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/amba-clcd.c b/drivers/video/amba-clcd.c index 3e386fd4c5c6..321dbe91dc14 100644 --- 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; |