[Linux-mips-commits]CVS: linux/drivers/video fbmem.c,1.8,1.9 maxinefb.c,1.3,1.4

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/drivers/video
In directory usw-pr-cvs1:/tmp/cvs-serv11592/drivers/video

Modified Files:
	fbmem.c maxinefb.c 
Log Message:
Further syncing with OSS 2.4.10. Massive restructuring of TLB handling.



Index: fbmem.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/video/fbmem.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- fbmem.c	2001/10/19 21:19:39	1.8
+++ fbmem.c	2001/10/22 19:16:45	1.9
@@ -20,7 +20,7 @@
 #include <linux/smp_lock.h>
 #include <linux/kernel.h>
 #include <linux/major.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/mman.h>
 #include <linux/tty.h>
 #include <linux/console.h>

Index: maxinefb.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/video/maxinefb.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- maxinefb.c	2001/10/19 21:19:39	1.3
+++ maxinefb.c	2001/10/22 19:16:45	1.4
@@ -31,7 +31,7 @@
 #include <linux/string.h>
 #include <linux/mm.h>
 #include <linux/tty.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/fb.h>