diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-14 15:18:01 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-14 15:18:01 -0500 |
| commit | f33b5d783b4f56be5ace6a1c98fb5f76b2d2d07d (patch) | |
| tree | b027b5f3429d416b3da5b9195024007dab062a5e /drivers/video/kyro | |
| parent | e935d5da8e5d12fabe5b632736c50eae0427e8c8 (diff) | |
| parent | 67963132638e67ad3c5aa16765e6f3f2f3cdd85c (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/video/kyro')
| -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); |