karo: cleanup after merge of v2015.10-rc2

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

diff --git a/include/atmel_lcd.h b/include/atmel_lcd.h
index 6993128b1b4c37df8d6c544cb2e06e0f220269c0..782e8862e772d17a77c0d33ccb964fd1db144c58 100644 (file)
--- a/include/atmel_lcd.h
+++ b/include/atmel_lcd.h
@@ -33,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