[Linuxconsole-commit]CVS: ruby/linux/drivers/video fbmem.c,1.57,1.58 hgafb.c,1.14,1.15 macfb.c,1.9,1.10

[James S. <jsi...@us...>]

Update of /cvsroot/linuxconsole/ruby/linux/drivers/video
In directory usw-pr-cvs1:/tmp/cvs-serv27749/drivers/video

Modified Files:
	fbmem.c hgafb.c macfb.c 
Log Message:
Synced to 2.5.3

Index: fbmem.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/fbmem.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- fbmem.c	20 Jan 2002 03:54:46 -0000	1.57
+++ fbmem.c	13 Mar 2002 23:48:37 -0000	1.58
@@ -84,6 +84,8 @@
 extern int atyfb_setup(char*);
 extern int aty128fb_init(void);
 extern int aty128fb_setup(char*);
+extern int neofb_init(void);
+extern int neofb_setup(char*);
 extern int igafb_init(void);
 extern int igafb_setup(char*);
 extern int imsttfb_init(void);
@@ -100,6 +102,7 @@
 extern int vga16fb_init(void);
 extern int vga16fb_setup(char*);
 extern int hgafb_init(void);
+extern int hgafb_setup(char*);
 extern int matroxfb_init(void);
 extern int matroxfb_setup(char*);
 extern int hpfb_init(void);
@@ -132,12 +135,12 @@
 extern int tx3912fb_init(void);
 extern int radeonfb_init(void);
 extern int radeonfb_setup(char*);
-extern int sstfb_init(void);
-extern int sstfb_setup(char*);
 extern int e1355fb_init(void);
 extern int e1355fb_setup(char*);
 extern int pvr2fb_init(void);
 extern int pvr2fb_setup(char*);
+extern int sstfb_init(void);
+extern int sstfb_setup(char*);
 extern int anakinfb_init(void);
 extern int sfb_init(void);
 extern int sed1345fb_init(void);
@@ -196,6 +199,9 @@
 #ifdef CONFIG_FB_ATY128
 	{ "aty128fb", aty128fb_init, aty128fb_setup },
 #endif
+#ifdef CONFIG_FB_NEOMAGIC
+	{ "neo", neofb_init, neofb_setup },
+#endif
 #ifdef CONFIG_FB_VIRGE
 	{ "virge", virgefb_init, virgefb_setup },
 #endif
@@ -229,10 +235,7 @@
 #ifdef CONFIG_FB_SIS
 	{ "sisfb", sisfb_init, sisfb_setup },
 #endif
-#ifdef CONFIG_FB_VOODOO1
-	{ "sstfb", sstfb_init, sstfb_setup },
-#endif
-
+	
 	/*
 	 * Generic drivers that are used as fallbacks
 	 * 
@@ -271,7 +274,7 @@
 	{ "macfb", macfb_init, macfb_setup },
 #endif
 #ifdef CONFIG_FB_HGA
-	{ "hga", hgafb_init, NULL },
+	{ "hga", hgafb_init, hgafb_setup },
 #endif 
 #ifdef CONFIG_FB_IGA
 	{ "igafb", igafb_init, igafb_setup },
@@ -309,6 +312,9 @@
 #ifdef CONFIG_FB_PVR2
        	{ "pvr2", pvr2fb_init, pvr2fb_setup },
 #endif
+#ifdef CONFIG_FB_VOODOO1
+	{ "sstfb", sstfb_init, sstfb_setup },
+#endif
 #ifdef CONFIG_FB_SED1345
 	{ "sed1345fb", sed1345fb_init, NULL },
 #endif
@@ -639,7 +645,7 @@
 	vma->vm_flags |= VM_IO;
 #if defined(__sparc_v9__)
 	vma->vm_flags |= (VM_SHM | VM_LOCKED);
-	if (io_remap_page_range(vma->vm_start, off,
+	if (io_remap_page_range(vma, vma->vm_start, off,
 				vma->vm_end - vma->vm_start, vma->vm_page_prot, 0))
 		return -EAGAIN;
 #else
@@ -672,7 +678,7 @@
 #else
 #warning What do we have to do here??
 #endif
-	if (io_remap_page_range(vma->vm_start, off,
+	if (io_remap_page_range(vma, vma->vm_start, off,
 			     vma->vm_end - vma->vm_start, vma->vm_page_prot))
 		return -EAGAIN;
 #endif /* !__sparc_v9__ */

Index: hgafb.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/hgafb.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- hgafb.c	29 Oct 2001 22:58:43 -0000	1.14
+++ hgafb.c	13 Mar 2002 23:48:37 -0000	1.15
@@ -702,7 +702,7 @@
 	disp.scrollmode = SCROLL_YREDRAW;
 	
 	strcpy (fb_info.modename, hga_fix.id);
-	fb_info.node = -1;
+	fb_info.node = NODEV;
 	fb_info.flags = FBINFO_FLAG_DEFAULT;
 /*	fb_info.open = ??? */
 	fb_info.var = hga_default_var;

Index: macfb.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/macfb.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- macfb.c	26 Dec 2001 17:28:11 -0000	1.9
+++ macfb.c	13 Mar 2002 23:48:37 -0000	1.10
@@ -1221,7 +1221,7 @@
 		}
 	
 	fb_info.changevar  = NULL;
-	fb_info.node       = -1;
+	fb_info.node       = NODEV;
 	fb_info.fbops      = &macfb_ops;
 	fb_info.disp       = &disp;
 	fb_info.switch_con = &macfb_switch;