fbdev: move FBIO_WAITFORVSYNC to linux/fb.h

[safe/jmp/linux-2.6] / drivers / video / kyro / STG4000InitDevice.c

diff --git a/drivers/video/kyro/STG4000InitDevice.c b/drivers/video/kyro/STG4000InitDevice.c
index 7e33cd3..1d3f208 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 "STG4000Interface.h"
 
 /* SDRAM fixed settings */
 #define SDRAM_CFG_0   0x49A1
@@ -246,7 +247,6 @@ int SetCoreClockPLL(volatile STG4000REG __iomem *pSTGReg, struct pci_dev *pDev)
        u32 ulCoreClock;
        u32 tmp;
        u32 ulChipSpeed;
-       u8 rev;
 
        STG_WRITE_REG(IntMask, 0xFFFF);
 
@@ -275,9 +275,9 @@ int SetCoreClockPLL(volatile STG4000REG __iomem *pSTGReg, struct pci_dev *pDev)
                      PMX2_SOFTRESET_ROM_RST);
 
        pci_read_config_word(pDev, PCI_CONFIG_SUBSYS_ID, &sub);
-       pci_read_config_byte(pDev, PCI_REVISION_ID, &rev);
 
-       ulChipSpeed = InitSDRAMRegisters(pSTGReg, (u32)sub, (u32)rev);
+       ulChipSpeed = InitSDRAMRegisters(pSTGReg, (u32)sub,
+                                        (u32)pDev->revision);
 
        if (ulChipSpeed == 0)
                return -EINVAL;