diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-12 15:49:27 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-12 15:49:27 -0800 |
commit | 94d40b699f0b9fb1b1da3b6abcd31d37c9aa2c22 (patch) | |
tree | c719fbb7e7d44d74b4d7b571f7ed3f0d338daf71 /drivers/video/cg6.c | |
parent | 062dfa433cce9a2c3941b3b8b96ae678f11230fa (diff) | |
parent | 1df2ab48f995b1599740a3f430df77fe24cb8ce9 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
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. */ |