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 7dbc7bbba65d781c7b92de91268aa342824436f7..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;