Merge branch 'imx' into devel

[linux-2.6-omap-h63xx.git] / include / asm-arm / arch-imx / imxfb.h

diff --git a/include/asm-arm/arch-imx/imxfb.h b/include/asm-arm/arch-imx/imxfb.h
index 2346d454ab9ca2255ae3dc8cc555b5666d4fcc90..3ed9ec8b9f008cb4c7fcdcc354e77bd40391ab99 100644 (file)
--- a/include/asm-arm/arch-imx/imxfb.h
+++ b/include/asm-arm/arch-imx/imxfb.h
@@ -7,6 +7,7 @@ struct imxfb_mach_info {
        u_short         xres;
        u_short         yres;
 
+       u_int           nonstd;
        u_char          bpp;
        u_char          hsync_len;
        u_char          left_margin;
@@ -25,6 +26,7 @@ struct imxfb_mach_info {
        u_int           pcr;
        u_int           pwmr;
        u_int           lscr1;
+       u_int           dmacr;
 
        u_char * fixed_screen_cpu;
        dma_addr_t fixed_screen_dma;