Merge branch 'for-3.2' of git://linux-nfs.org/~bfields/linux

[pandora-kernel.git] / drivers / video / au1100fb.h

diff --git a/drivers/video/au1100fb.h b/drivers/video/au1100fb.h
index 2855534..12d9642 100644 (file)
--- a/drivers/video/au1100fb.h
+++ b/drivers/video/au1100fb.h
@@ -108,6 +108,7 @@ struct au1100fb_device {
        unsigned char*          fb_mem;         /* FrameBuffer memory map */
        size_t                  fb_len;
        dma_addr_t              fb_phys;
+       int                     panel_idx;
 };
 
 /********************************************************************/
@@ -274,7 +275,7 @@ static struct au1100fb_panel known_lcd_panels[] =
                .bpp = 16,
                .control_base = 0x0004886A |
                        LCD_CONTROL_DEFAULT_PO | LCD_CONTROL_DEFAULT_SBPPF |
-                       LCD_CONTROL_BPP_16,
+                       LCD_CONTROL_BPP_16 | LCD_CONTROL_SBB_4,
                .clkcontrol_base = 0x00020000,
                .horztiming = 0x005aff1f,
                .verttiming = 0x16000e57,
@@ -364,11 +365,6 @@ static struct au1100fb_panel known_lcd_panels[] =
        },
 };
 
-struct au1100fb_drv_info {
-       int     panel_idx;
-       char    *opt_mode;
-};
-
 /********************************************************************/
 
 /* Inline helpers */