[LV-kern-commit] CVS: kernel-2.4/drivers/char dz.c,1.3,1.4 tty_io.c,1.3,1.4

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.4/drivers/char
In directory usw-pr-cvs1:/tmp/cvs-serv9637/drivers/char

Modified Files:
	dz.c tty_io.c 
Log Message:
Merge Linus' official 2.4.2 tree


Index: dz.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/dz.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dz.c	2001/01/26 00:27:00	1.3
+++ dz.c	2001/02/26 02:28:27	1.4
@@ -33,7 +33,7 @@
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/init.h> 
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/mm.h>
 #include <linux/major.h>
 #include <linux/param.h>

Index: tty_io.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/tty_io.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tty_io.c	2001/02/21 00:21:40	1.3
+++ tty_io.c	2001/02/26 02:28:27	1.4
@@ -81,7 +81,7 @@
 #include <linux/kd.h>
 #include <linux/mm.h>
 #include <linux/string.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/poll.h>
 #include <linux/proc_fs.h>
 #include <linux/init.h>
@@ -139,7 +139,6 @@
 int tty_ioctl(struct inode * inode, struct file * file,
 	      unsigned int cmd, unsigned long arg);
 static int tty_fasync(int fd, struct file * filp, int on);
-extern int sx_init (void);
 extern int vme_scc_init (void);
 extern long vme_scc_console_init(void);
 extern int serial167_init(void);