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
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
/
STG4000InitDevice.c
diff --git
a/drivers/video/kyro/STG4000InitDevice.c
b/drivers/video/kyro/STG4000InitDevice.c
index
11f70e3
..
ab5285a
100644
(file)
--- a/
drivers/video/kyro/STG4000InitDevice.c
+++ b/
drivers/video/kyro/STG4000InitDevice.c
@@
-15,6
+15,7
@@
#include <linux/pci.h>
#include "STG4000Reg.h"
#include <linux/pci.h>
#include "STG4000Reg.h"
+#include "STG4000Interface.h"
/* SDRAM fixed settings */
#define SDRAM_CFG_0 0x49A1
/* SDRAM fixed settings */
#define SDRAM_CFG_0 0x49A1
@@
-79,8
+80,8
@@
volatile u32 i,count=0; \
for(i=0;i<X;i++) count++; \
}
for(i=0;i<X;i++) count++; \
}
-
u32 InitSDRAMRegisters(volatile STG4000REG * pSTGReg, u32 dwSubSysID
,
- u32 dwRevID)
+
static u32 InitSDRAMRegisters(volatile STG4000REG __iomem *pSTGReg
,
+
u32 dwSubSysID,
u32 dwRevID)
{
u32 adwSDRAMArgCfg0[] = { 0xa0, 0x80, 0xa0, 0xa0, 0xa0 };
u32 adwSDRAMCfg1[] = { 0x8732, 0x8732, 0xa732, 0xa732, 0x8732 };
{
u32 adwSDRAMArgCfg0[] = { 0xa0, 0x80, 0xa0, 0xa0, 0xa0 };
u32 adwSDRAMCfg1[] = { 0x8732, 0x8732, 0xa732, 0xa732, 0x8732 };
@@
-239,7
+240,7
@@
u32 ProgramClock(u32 refClock,
return (ulBestClk);
}
return (ulBestClk);
}
-int SetCoreClockPLL(volatile STG4000REG
*
pSTGReg, struct pci_dev *pDev)
+int SetCoreClockPLL(volatile STG4000REG
__iomem *
pSTGReg, struct pci_dev *pDev)
{
u32 F, R, P;
u16 core_pll = 0, sub;
{
u32 F, R, P;
u16 core_pll = 0, sub;