diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 00:07:46 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 00:07:46 -0500 |
| commit | 783e3385a134305d49d7b431df6e591265e7ec14 (patch) | |
| tree | 7db0b8f854201e2ad343ea5b1c6fab7c3bca5a9b /drivers/video/cg6.c | |
| parent | fd803241744ad6e4262b6588c6af89e8fb794098 (diff) | |
| parent | 1cf9e8a7865c0ac216034e519cf6b8505055ea50 (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'drivers/video/cg6.c')
| -rw-r--r-- | drivers/video/cg6.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/video/cg6.c b/drivers/video/cg6.c index 9debe642fd2..050835e39aa 100644 --- a/drivers/video/cg6.c +++ b/drivers/video/cg6.c @@ -265,7 +265,6 @@ struct cg6_par { unsigned long fbsize; struct sbus_dev *sdev; - struct list_head list; }; static int cg6_sync(struct fb_info *info) @@ -612,7 +611,7 @@ static void cg6_chip_init(struct fb_info *info) struct cg6_par *par = (struct cg6_par *) info->par; struct cg6_tec __iomem *tec = par->tec; struct cg6_fbc __iomem *fbc = par->fbc; - u32 rev, conf, mode, tmp; + u32 rev, conf, mode; int i; /* Turn off stuff in the Transform Engine. */ |