Merge branch 'tx51-bugfix' into karo-devel

[karo-tx-uboot.git] / include / atmel_lcd.h

diff --git a/include/atmel_lcd.h b/include/atmel_lcd.h
index fa8aa294542f60e2af44a723417e6ec6183507ee..782e8862e772d17a77c0d33ccb964fd1db144c58 100644 (file)
--- a/include/atmel_lcd.h
+++ b/include/atmel_lcd.h
@@ -13,7 +13,8 @@
 typedef struct vidinfo {
        ushort vl_col;          /* Number of columns (i.e. 640) */
        ushort vl_row;          /* Number of rows (i.e. 480) */
-       u_long vl_clk;  /* pixel clock in ps    */
+       ushort vl_rot;          /* Rotation of Display (0, 1, 2, 3) */
+       u_long vl_clk;          /* pixel clock in ps    */
 
        /* LCD configuration register */
        u_long vl_sync;         /* Horizontal / vertical sync */
@@ -32,7 +33,7 @@ typedef struct vidinfo {
        u_long vl_upper_margin; /* Time from sync to picture */
        u_long vl_lower_margin; /* Time from picture to sync */
 
-       u_long  mmio;           /* Memory mapped registers */
+       void __iomem *mmio;     /* Memory mapped registers */
 } vidinfo_t;
 
 #endif