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 / STG4000VTG.c

diff --git a/drivers/video/kyro/STG4000VTG.c b/drivers/video/kyro/STG4000VTG.c
index 59c4a18..bd38970 100644 (file)
--- a/drivers/video/kyro/STG4000VTG.c
+++ b/drivers/video/kyro/STG4000VTG.c
@@ -14,10 +14,10 @@
 #include "STG4000Reg.h"
 #include "STG4000Interface.h"
 
-void DisableVGA(volatile STG4000REG * pSTGReg)
+void DisableVGA(volatile STG4000REG __iomem *pSTGReg)
 {
        u32 tmp;
-       volatile u32 count, i;
+       volatile u32 count = 0, i;
 
        /* Reset the VGA registers */
        tmp = STG_READ_REG(SoftwareReset);
@@ -35,7 +35,7 @@ void DisableVGA(volatile STG4000REG * pSTGReg)
        STG_WRITE_REG(SoftwareReset, tmp);
 }
 
-void StopVTG(volatile STG4000REG * pSTGReg)
+void StopVTG(volatile STG4000REG __iomem *pSTGReg)
 {
        u32 tmp = 0;
 
@@ -45,7 +45,7 @@ void StopVTG(volatile STG4000REG * pSTGReg)
        STG_WRITE_REG(DACSyncCtrl, tmp);
 }
 
-void StartVTG(volatile STG4000REG * pSTGReg)
+void StartVTG(volatile STG4000REG __iomem *pSTGReg)
 {
        u32 tmp = 0;
 
@@ -56,7 +56,7 @@ void StartVTG(volatile STG4000REG * pSTGReg)
        STG_WRITE_REG(DACSyncCtrl, tmp);
 }
 
-void SetupVTG(volatile STG4000REG * pSTGReg,
+void SetupVTG(volatile STG4000REG __iomem *pSTGReg,
              const struct kyrofb_info * pTiming)
 {
        u32 tmp = 0;