X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=drivers%2Fvideo%2Fkyro%2FSTG4000OverlayDevice.c;h=fcdc5328920f3a80cb44816c2f76d3bfa35bae05;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=25b286b4e09c0732af07d62824e62211cd8ea105;hpb=87fc8d1bb10cd459024a742c6a10961fefcef18f;p=linux-2.6.git diff --git a/drivers/video/kyro/STG4000OverlayDevice.c b/drivers/video/kyro/STG4000OverlayDevice.c index 25b286b4e..fcdc53289 100644 --- a/drivers/video/kyro/STG4000OverlayDevice.c +++ b/drivers/video/kyro/STG4000OverlayDevice.c @@ -75,7 +75,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 +136,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 +238,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 +284,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 +313,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) {