Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / drivers / video / kyro / STG4000OverlayDevice.c

diff --git a/drivers/video/kyro/STG4000OverlayDevice.c b/drivers/video/kyro/STG4000OverlayDevice.c
index 25b286b..a8c9713 100644 (file)
--- a/drivers/video/kyro/STG4000OverlayDevice.c
+++ b/drivers/video/kyro/STG4000OverlayDevice.c
@@ -14,6 +14,7 @@
 #include <linux/types.h>
 
 #include "STG4000Reg.h"
+#include "STG4000Interface.h"
 
 /* HW Defines */
 
@@ -42,8 +43,8 @@
 #define STG4000_OVRL_MAX_HEIGHT 576
 
 /* Decimation and Scaling */
-u32 adwDecim8[33] = {
-       0xffffffff, 0xfffeffff, 0xffdffbff, 0xfefefeff, 0xfdf7efbf,
+static u32 adwDecim8[33] = {
+           0xffffffff, 0xfffeffff, 0xffdffbff, 0xfefefeff, 0xfdf7efbf,
            0xfbdf7bdf, 0xf7bbddef, 0xeeeeeeef, 0xeeddbb77, 0xedb76db7,
            0xdb6db6db, 0xdb5b5b5b, 0xdab5ad6b, 0xd5ab55ab, 0xd555aaab,
            0xaaaaaaab, 0xaaaa5555, 0xaa952a55, 0xa94a5295, 0xa5252525,
@@ -75,7 +76,7 @@ typedef struct _OVRL_SRC_DEST {
 static u32 ovlWidth, ovlHeight, ovlStride;
 static int ovlLinear;
 
-void ResetOverlayRegisters(volatile STG4000REG * pSTGReg)
+void ResetOverlayRegisters(volatile STG4000REG __iomem *pSTGReg)
 {
        u32 tmp;
 
@@ -136,7 +137,7 @@ void ResetOverlayRegisters(volatile STG4000REG * pSTGReg)
 
 }
 
-int CreateOverlaySurface(volatile STG4000REG * pSTGReg,
+int CreateOverlaySurface(volatile STG4000REG __iomem *pSTGReg,
                         u32 inWidth,
                         u32 inHeight,
                         int bLinear,
@@ -238,7 +239,7 @@ int CreateOverlaySurface(volatile STG4000REG * pSTGReg,
        return 0;
 }
 
-int SetOverlayBlendMode(volatile STG4000REG * pSTGReg,
+int SetOverlayBlendMode(volatile STG4000REG __iomem *pSTGReg,
                        OVRL_BLEND_MODE mode,
                        u32 ulAlpha, u32 ulColorKey)
 {
@@ -284,7 +285,7 @@ int SetOverlayBlendMode(volatile STG4000REG * pSTGReg,
        return 0;
 }
 
-void EnableOverlayPlane(volatile STG4000REG * pSTGReg)
+void EnableOverlayPlane(volatile STG4000REG __iomem *pSTGReg)
 {
        u32 tmp;
        /* Enable Overlay */
@@ -313,7 +314,7 @@ static u32 Overlap(u32 ulBits, u32 ulPattern)
 
 }
 
-int SetOverlayViewPort(volatile STG4000REG * pSTGReg,
+int SetOverlayViewPort(volatile STG4000REG __iomem *pSTGReg,
                       u32 left, u32 top,
                       u32 right, u32 bottom)
 {