Merge branch 'for_3.4/fixes/pm' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / drivers / video / atmel_lcdfb.c

diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
index e40c00f..d99505b 100644 (file)
--- a/drivers/video/atmel_lcdfb.c
+++ b/drivers/video/atmel_lcdfb.c
@@ -421,24 +421,18 @@ static int atmel_lcdfb_check_var(struct fb_var_screeninfo *var,
                var->red.length = var->green.length = var->blue.length
                        = var->bits_per_pixel;
                break;
-       case 15:
        case 16:
                if (sinfo->lcd_wiring_mode == ATMEL_LCDC_WIRING_RGB) {
                        /* RGB:565 mode */
                        var->red.offset = 11;
                        var->blue.offset = 0;
-                       var->green.length = 6;
-               } else if (sinfo->lcd_wiring_mode == ATMEL_LCDC_WIRING_RGB555) {
-                       var->red.offset = 10;
-                       var->blue.offset = 0;
-                       var->green.length = 5;
                } else {
-                       /* BGR:555 mode */
+                       /* BGR:565 mode */
                        var->red.offset = 0;
-                       var->blue.offset = 10;
-                       var->green.length = 5;
+                       var->blue.offset = 11;
                }
                var->green.offset = 5;
+               var->green.length = 6;
                var->red.length = var->blue.length = 5;
                break;
        case 32: