Merge with Linu 2.4.0-test6-pre6.

12 files changed, 12 insertions, 66 deletions

diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 886229370..d3b8959d4 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -10,8 +10,6 @@ ALL_SUB_DIRS    := $(SUB_DIRS) matrox riva
 O_TARGET := video.o
 O_OBJS   :=
 M_OBJS   :=
-# This is a nice idea but needs depmod altering
-# MOD_LIST_NAME := VIDEO_MODULES
 
 # All of the (potential) objects that export symbols.
 # This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'.
diff --git a/drivers/video/cyber2000fb.c b/drivers/video/cyber2000fb.c
index 0a1473520..1888331ac 100644
--- a/drivers/video/cyber2000fb.c
+++ b/drivers/video/cyber2000fb.c
@@ -1208,11 +1208,6 @@ static struct fb_videomode __devinitdata cyber2000fb_default_mode = {
 	vmode:		FB_VMODE_NONINTERLACED
 };
 
-int __init cyber2000fb_setup(char *options)
-{
-	return 0;
-}
-
 static char igs_regs[] __devinitdata = {
 					0x12, 0x00,	0x13, 0x00,
 					0x16, 0x00,
diff --git a/drivers/video/cyberfb.c b/drivers/video/cyberfb.c
index 20b8c4b2a..bd7618def 100644
--- a/drivers/video/cyberfb.c
+++ b/drivers/video/cyberfb.c
@@ -1066,7 +1066,7 @@ int __init cyberfb_init(void)
 	    CyberRegs_phys = CyberMem_phys + 0x00c00000;
 	    if (!request_mem_region(CyberRegs_phys, 0x10000, "S3 Trio64"))
 		continue;
-	    if (!request_mem_region(CyberMem_phys, 0x4000000, "RAM")) {
+	    if (!request_mem_region(CyberMem_phys, 0x400000, "RAM")) {
 		release_mem_region(CyberRegs_phys, 0x10000);
 		continue;
 	    }
@@ -1110,7 +1110,8 @@ int __init cyberfb_init(void)
 
 	    if (register_framebuffer(&fb_info) < 0) {
 		    DPRINTK("EXIT - register_framebuffer failed\n");
-		    release_mem_region(board_addr, board_size);
+		    release_mem_region(CyberMem_phys, 0x400000);
+		    release_mem_region(CyberRegs_phys, 0x10000);
 		    return -EINVAL;
 	    }
 
diff --git a/drivers/video/dn_cfb4.c b/drivers/video/dn_cfb4.c
index 5d7ab81a5..205703be4 100644
--- a/drivers/video/dn_cfb4.c
+++ b/drivers/video/dn_cfb4.c
@@ -107,8 +107,6 @@
 #define SWAP(A) ((A>>8) | ((A&0xff) <<8))
 
 
-void dn_video_setup(char *options, int *ints);
-
 /* frame buffer operations */
 
 static int dn_fb_get_fix(struct fb_fix_screeninfo *fix, int con, 
@@ -364,12 +362,6 @@ static void dnfbcon_blank(int blank,  struct fb_info *info) {
 
 }
 
-void dn_video_setup(char *options, int *ints) {
-	
-	return;
-
-}
-
 void dn_bitblt(struct display *p,int x_src,int y_src, int x_dest, int y_dest,
                int x_count, int y_count) {
 
diff --git a/drivers/video/dn_cfb8.c b/drivers/video/dn_cfb8.c
index fa2cb1e67..a654717b3 100644
--- a/drivers/video/dn_cfb8.c
+++ b/drivers/video/dn_cfb8.c
@@ -108,8 +108,6 @@
 #define SWAP(A) ((A>>8) | ((A&0xff) <<8))
 
 
-void dn_video_setup(char *options, int *ints);
-
 /* frame buffer operations */
 
 static int dn_fb_get_fix(struct fb_fix_screeninfo *fix, int con, 
@@ -353,12 +351,6 @@ static void dnfbcon_blank(int blank,  struct fb_info *info) {
 
 }
 
-void dn_video_setup(char *options, int *ints) {
-	
-	return;
-
-}
-
 void dn_bitblt(struct display *p,int x_src,int y_src, int x_dest, int y_dest,
                int x_count, int y_count) {
 
diff --git a/drivers/video/dnfb.c b/drivers/video/dnfb.c
index 6fd59a64d..2deaeca27 100644
--- a/drivers/video/dnfb.c
+++ b/drivers/video/dnfb.c
@@ -113,8 +113,6 @@
 #endif
 
 
-void dn_video_setup(char *options, int *ints);
-
 /* frame buffer operations */
 
 static int dn_fb_get_fix(struct fb_fix_screeninfo *fix, int con, 
@@ -366,12 +364,6 @@ static void dnfbcon_blank(int blank,  struct fb_info *info) {
 
 }
 
-void dn_video_setup(char *options, int *ints) {
-	
-	return;
-
-}
-
 void dn_bitblt(struct display *p,int x_src,int y_src, int x_dest, int y_dest,
                int x_count, int y_count) {
 
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 6ca8c3dcf..07b912ebf 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -57,13 +57,11 @@ extern int cyberfb_setup(char*);
 extern int pm2fb_init(void);
 extern int pm2fb_setup(char*);
 extern int cyber2000fb_init(void);
-extern int cyber2000fb_setup(char*);
 extern int retz3fb_init(void);
 extern int retz3fb_setup(char*);
 extern int clgenfb_init(void);
 extern int clgenfb_setup(char*);
 extern int hitfb_init(void);
-extern int hitfb_setup(char*);
 extern int vfb_init(void);
 extern int vfb_setup(char*);
 extern int offb_init(void);
@@ -91,7 +89,6 @@ extern int hgafb_setup(char*);
 extern int matroxfb_init(void);
 extern int matroxfb_setup(char*);
 extern int hpfb_init(void);
-extern int hpfb_setup(char*);
 extern int sbusfb_init(void);
 extern int sbusfb_setup(char*);
 extern int control_init(void);
@@ -103,7 +100,6 @@ extern int valkyriefb_setup(char*);
 extern int chips_init(void);
 extern int g364fb_init(void);
 extern int sa1100fb_init(void);
-extern int sa1100fb_setup(char*);
 extern int fm2fb_init(void);
 extern int fm2fb_setup(char*);
 extern int q40fb_init(void);
@@ -146,7 +142,7 @@ static struct {
 	{ "cyber", cyberfb_init, cyberfb_setup },
 #endif
 #ifdef CONFIG_FB_CYBER2000
-	{ "cyber2000", cyber2000fb_init, cyber2000fb_setup },
+	{ "cyber2000", cyber2000fb_init, NULL },
 #endif
 #ifdef CONFIG_FB_PM2
 	{ "pm2fb", pm2fb_init, pm2fb_setup },
@@ -232,7 +228,7 @@ static struct {
 	{ "hga", hgafb_init, hgafb_setup },
 #endif 
 #ifdef CONFIG_FB_IGA
-        { "igafb", igafb_init, igafb_setup },
+	{ "igafb", igafb_init, igafb_setup },
 #endif
 #ifdef CONFIG_APOLLO
 	{ "apollo", dnfb_init, NULL },
@@ -244,19 +240,19 @@ static struct {
 	{ "tga", tgafb_init, tgafb_setup },
 #endif
 #ifdef CONFIG_FB_HP300
-	{ "hpfb", hpfb_init, hpfb_setup },
+	{ "hpfb", hpfb_init, NULL },
 #endif 
 #ifdef CONFIG_FB_G364
 	{ "g364", g364fb_init, NULL },
 #endif
 #ifdef CONFIG_FB_SA1100
-	{ "sa1100", sa1100fb_init, sa1100fb_setup },
+	{ "sa1100", sa1100fb_init, NULL },
 #endif
 #ifdef CONFIG_FB_SUN3
-       { "sun3", sun3fb_init, sun3fb_setup },
+	{ "sun3", sun3fb_init, sun3fb_setup },
 #endif
 #ifdef CONFIG_FB_HIT
-       { "hitfb", hitfb_init, hitfb_setup },
+	{ "hitfb", hitfb_init, NULL },
 #endif
 
 	/*
@@ -604,7 +600,7 @@ fb_mmap(struct file *file, struct vm_area_struct * vma)
 	pgprot_val(vma->vm_page_prot) &= ~(PTE_CACHEABLE | PTE_BUFFERABLE);
 #endif
 #elif defined(__sh__)
-        pgprot_val(vma->vm_page_prot) &= ~_PAGE_CACHABLE;
+	pgprot_val(vma->vm_page_prot) &= ~_PAGE_CACHABLE;
 #else
 #warning What do we have to do here??
 #endif
diff --git a/drivers/video/hitfb.c b/drivers/video/hitfb.c
index 589823acd..e48d8a74c 100644
--- a/drivers/video/hitfb.c
+++ b/drivers/video/hitfb.c
@@ -68,7 +68,6 @@ unsigned long hit_videobase, hit_videosize;
 static struct fb_var_screeninfo default_var;
 
 int hitfb_init(void);
-int hitfb_setup(char*);
 
 static void hitfb_set_par(struct hitfb_par *par, const struct fb_info *info);
 static void hitfb_encode_var(struct fb_var_screeninfo *var, 
@@ -338,12 +337,6 @@ void hitfb_cleanup(struct fb_info *info)
 }
 
 
-int __init hitfb_setup(char *options)
-{
-    return 0;
-}
-
-
 #ifdef MODULE
 int init_module(void)
 {
diff --git a/drivers/video/hpfb.c b/drivers/video/hpfb.c
index 4bfc4a9ef..9e3be3e27 100644
--- a/drivers/video/hpfb.c
+++ b/drivers/video/hpfb.c
@@ -399,8 +399,3 @@ int __init hpfb_init(void)
 
 	return 0;
 }
-
-int __init hpfb_setup(char *options)
-{
-	return 0;
-}
diff --git a/drivers/video/matrox/Makefile b/drivers/video/matrox/Makefile
index 6de9be372..fcf02722b 100644
--- a/drivers/video/matrox/Makefile
+++ b/drivers/video/matrox/Makefile
@@ -10,8 +10,6 @@ ALL_SUB_DIRS    := $(SUB_DIRS)
 O_TARGET := matrox.o
 O_OBJS   :=
 M_OBJS   :=
-# This is a nice idea but needs depmod altering
-# MOD_LIST_NAME := VIDEO_MODULES
 
 # All of the (potential) objects that export symbols.
 # This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'.
diff --git a/drivers/video/sa1100fb.c b/drivers/video/sa1100fb.c
index df2d81b66..7a91d0b01 100644
--- a/drivers/video/sa1100fb.c
+++ b/drivers/video/sa1100fb.c
@@ -1197,9 +1197,3 @@ int __init sa1100fb_init(void)
 
 	return 0;
 }
-
-int __init sa1100fb_setup(char *options)
-{
-	return 0;
-}
-
diff --git a/drivers/video/sgivwfb.c b/drivers/video/sgivwfb.c
index 7fcbf0bd5..e1751e84e 100644
--- a/drivers/video/sgivwfb.c
+++ b/drivers/video/sgivwfb.c
@@ -823,8 +823,8 @@ static int sgivwfb_set_cmap(struct fb_cmap *cmap, int kspc, int con,
   int err;
 
   if (!fb_display[con].cmap.len) {	/* no colormap allocated? */
-    if ((err = fb_alloc_cmap(&fb_display[con].cmap,
-			     1<<fb_display[con].var.bits_per_pixel, 0)))
+    int size = fb_display[con].var.bits_per_pixel == 16 ? 32 : 256;
+    if ((err = fb_alloc_cmap(&fb_display[con].cmap, size, 0)))
       return err;
   }
   if (con == currcon)			/* current console? */