diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-11 13:35:31 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-11 13:35:31 -0500 |
| commit | 749dfc70554f2c9e6624ac843d66571265ed9338 (patch) | |
| tree | bf591255b3f158222f90852d53c4279e6e7e9ced /drivers/video/kyro/STG4000VTG.c | |
| parent | 74f5ec29ae93aa42c49f4285c20c457afe937881 (diff) | |
| parent | 0992a5d029181421877a716eaf99145828ff7eae (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'drivers/video/kyro/STG4000VTG.c')
| -rw-r--r-- | drivers/video/kyro/STG4000VTG.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/kyro/STG4000VTG.c b/drivers/video/kyro/STG4000VTG.c index 3690b04190af..bd389709d234 100644 --- a/drivers/video/kyro/STG4000VTG.c +++ b/drivers/video/kyro/STG4000VTG.c | |||
| @@ -17,7 +17,7 @@ | |||
| 17 | void DisableVGA(volatile STG4000REG __iomem *pSTGReg) | 17 | void DisableVGA(volatile STG4000REG __iomem *pSTGReg) |
| 18 | { | 18 | { |
| 19 | u32 tmp; | 19 | u32 tmp; |
| 20 | volatile u32 count, i; | 20 | volatile u32 count = 0, i; |
| 21 | 21 | ||
| 22 | /* Reset the VGA registers */ | 22 | /* Reset the VGA registers */ |
| 23 | tmp = STG_READ_REG(SoftwareReset); | 23 | tmp = STG_READ_REG(SoftwareReset); |