Merge branch 'linus' into perfcounters/core

[mv-sheeva.git] / arch / arm / mach-pxa / include / mach / pxafb.h

diff --git a/arch/arm/mach-pxa/include/mach/pxafb.h b/arch/arm/mach-pxa/include/mach/pxafb.h
index cb44410cd4560d5da9ecacd3a4f79d63aaea4230..6932720ba04e39deea7c7f25fdea94316b2feb68 100644 (file)
--- a/arch/arm/mach-pxa/include/mach/pxafb.h
+++ b/arch/arm/mach-pxa/include/mach/pxafb.h
@@ -95,6 +95,10 @@ struct pxafb_mode_info {
         *    in pxa27x and pxa3xx, initialize them to the same value or
         *    the larger one will be used
         * 3. same to {rd,wr}_pulse_width
+        *
+        * 4. LCD_PCLK_EDGE_{RISE,FALL} controls the L_PCLK_WR polarity
+        * 5. sync & FB_SYNC_HOR_HIGH_ACT controls the L_LCLK_A0
+        * 6. sync & FB_SYNC_VERT_HIGH_ACT controls the L_LCLK_RD
         */
        unsigned        a0csrd_set_hld; /* A0 and CS Setup/Hold Time before/after L_FCLK_RD */
        unsigned        a0cswr_set_hld; /* A0 and CS Setup/Hold Time before/after L_PCLK_WR */
@@ -109,6 +113,7 @@ struct pxafb_mach_info {
        unsigned int num_modes;
 
        unsigned int    lcd_conn;
+       unsigned long   video_mem_size;
 
        u_int           fixed_modes:1,
                        cmap_inverse:1,