git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[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
..
fcdc532
100644
(file)
--- 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;
static u32 ovlWidth, ovlHeight, ovlStride;
static int ovlLinear;
-void ResetOverlayRegisters(volatile STG4000REG
*
pSTGReg)
+void ResetOverlayRegisters(volatile STG4000REG
__iomem *
pSTGReg)
{
u32 tmp;
{
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,
u32 inWidth,
u32 inHeight,
int bLinear,
@@
-238,7
+238,7
@@
int CreateOverlaySurface(volatile STG4000REG * pSTGReg,
return 0;
}
return 0;
}
-int SetOverlayBlendMode(volatile STG4000REG
*
pSTGReg,
+int SetOverlayBlendMode(volatile STG4000REG
__iomem *
pSTGReg,
OVRL_BLEND_MODE mode,
u32 ulAlpha, u32 ulColorKey)
{
OVRL_BLEND_MODE mode,
u32 ulAlpha, u32 ulColorKey)
{
@@
-284,7
+284,7
@@
int SetOverlayBlendMode(volatile STG4000REG * pSTGReg,
return 0;
}
return 0;
}
-void EnableOverlayPlane(volatile STG4000REG
*
pSTGReg)
+void EnableOverlayPlane(volatile STG4000REG
__iomem *
pSTGReg)
{
u32 tmp;
/* Enable Overlay */
{
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)
{
u32 left, u32 top,
u32 right, u32 bottom)
{