diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-12 23:49:27 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-12 23:49:27 (GMT) |
commit | 94d40b699f0b9fb1b1da3b6abcd31d37c9aa2c22 (patch) | |
tree | c719fbb7e7d44d74b4d7b571f7ed3f0d338daf71 /drivers | |
parent | 062dfa433cce9a2c3941b3b8b96ae678f11230fa (diff) | |
parent | 1df2ab48f995b1599740a3f430df77fe24cb8ce9 (diff) | |
download | linux-94d40b699f0b9fb1b1da3b6abcd31d37c9aa2c22.tar.xz |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/video/bw2.c | 1 | ||||
-rw-r--r-- | drivers/video/cg14.c | 1 | ||||
-rw-r--r-- | drivers/video/cg3.c | 1 | ||||
-rw-r--r-- | drivers/video/cg6.c | 3 | ||||
-rw-r--r-- | drivers/video/ffb.c | 1 | ||||
-rw-r--r-- | drivers/video/leo.c | 1 | ||||
-rw-r--r-- | drivers/video/p9100.c | 1 | ||||
-rw-r--r-- | drivers/video/tcx.c | 3 |
8 files changed, 2 insertions, 10 deletions
diff --git a/drivers/video/bw2.c b/drivers/video/bw2.c index d3728f6..9248fe1 100644 --- a/drivers/video/bw2.c +++ b/drivers/video/bw2.c @@ -121,7 +121,6 @@ struct bw2_par { unsigned long fbsize; struct sbus_dev *sdev; - struct list_head list; }; /** diff --git a/drivers/video/cg14.c b/drivers/video/cg14.c index 1bed50f..a561471 100644 --- a/drivers/video/cg14.c +++ b/drivers/video/cg14.c @@ -206,7 +206,6 @@ struct cg14_par { int mode; int ramsize; struct sbus_dev *sdev; - struct list_head list; }; static void __cg14_reset(struct cg14_par *par) diff --git a/drivers/video/cg3.c b/drivers/video/cg3.c index a1354e7..9fcd896 100644 --- a/drivers/video/cg3.c +++ b/drivers/video/cg3.c @@ -124,7 +124,6 @@ struct cg3_par { unsigned long fbsize; struct sbus_dev *sdev; - struct list_head list; }; /** diff --git a/drivers/video/cg6.c b/drivers/video/cg6.c index 9debe64..050835e3 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. */ diff --git a/drivers/video/ffb.c b/drivers/video/ffb.c index 2584dae..c4870d5 100644 --- a/drivers/video/ffb.c +++ b/drivers/video/ffb.c @@ -359,7 +359,6 @@ struct ffb_par { int prom_parent_node; int dac_rev; int board_type; - struct list_head list; }; static void FFBFifo(struct ffb_par *par, int n) diff --git a/drivers/video/leo.c b/drivers/video/leo.c index 376d4a1..494287f 100644 --- a/drivers/video/leo.c +++ b/drivers/video/leo.c @@ -197,7 +197,6 @@ struct leo_par { unsigned long fbsize; struct sbus_dev *sdev; - struct list_head list; }; static void leo_wait(struct leo_lx_krn __iomem *lx_krn) diff --git a/drivers/video/p9100.c b/drivers/video/p9100.c index 18bcda2..b251e75 100644 --- a/drivers/video/p9100.c +++ b/drivers/video/p9100.c @@ -140,7 +140,6 @@ struct p9100_par { unsigned long fbsize; struct sbus_dev *sdev; - struct list_head list; }; /** diff --git a/drivers/video/tcx.c b/drivers/video/tcx.c index fe4f63f..2b27b44 100644 --- a/drivers/video/tcx.c +++ b/drivers/video/tcx.c @@ -125,7 +125,6 @@ struct tcx_par { int lowdepth; struct sbus_dev *sdev; - struct list_head list; }; /* Reset control plane so that WID is 8-bit plane. */ @@ -444,7 +443,7 @@ static void tcx_init_one(struct sbus_dev *sdev) tcx_reset(&all->info); - tcx_blank(0, &all->info); + tcx_blank(FB_BLANK_UNBLANK, &all->info); if (fb_alloc_cmap(&all->info.cmap, 256, 0)) { printk(KERN_ERR "tcx: Could not allocate color map.\n"); |