This commit was manufactured by cvs2svn to create tag

[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 97681e3..65436fe 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
+#ifndef CONFIG_ARCH_VERSATILE_PB
 #define CLCD_IENB              0x00000018
 #define CLCD_CNTL              0x0000001c
 #else
@@ -141,7 +141,7 @@ struct clcd_fb {
        struct clcd_panel       *panel;
        struct clcd_board       *board;
        void                    *board_data;
-       void __iomem            *regs;
+       void                    *regs;
        u32                     clcd_cntl;
        u32                     cmap[16];
 };