vserver 1.9.5.x5

[linux-2.6.git] / include / asm-arm / hardware / amba_clcd.h

diff --git a/include/asm-arm/hardware/amba_clcd.h b/include/asm-arm/hardware/amba_clcd.h
index 65436fe..2149be7 100644 (file)
--- a/include/asm-arm/hardware/amba_clcd.h
+++ b/include/asm-arm/hardware/amba_clcd.h
@@ -22,7 +22,7 @@
 #define CLCD_UBAS              0x00000010
 #define CLCD_LBAS              0x00000014
 
-#ifndef CONFIG_ARCH_VERSATILE_PB
+#ifndef CONFIG_ARCH_VERSATILE
 #define CLCD_IENB              0x00000018
 #define CLCD_CNTL              0x0000001c
 #else
@@ -124,6 +124,11 @@ struct clcd_board {
         */
        int     (*setup)(struct clcd_fb *);
 
+       /*
+        * mmap the framebuffer memory
+        */
+       int     (*mmap)(struct clcd_fb *, struct vm_area_struct *);
+
        /*
         * Remove platform specific parts of CLCD driver
         */
@@ -141,7 +146,7 @@ struct clcd_fb {
        struct clcd_panel       *panel;
        struct clcd_board       *board;
        void                    *board_data;
-       void                    *regs;
+       void __iomem            *regs;
        u32                     clcd_cntl;
        u32                     cmap[16];
 };