patch-2.4.2 linux/drivers/net/hamachi.c

• Lines: 18
• Date: Tue Feb 13 13:15:05 2001
• Orig file: v2.4.1/linux/drivers/net/hamachi.c
• Orig date: Mon Dec 11 13:38:29 2000

diff -u --recursive --new-file v2.4.1/linux/drivers/net/hamachi.c linux/drivers/net/hamachi.c
@@ -4,7 +4,7 @@
 	Updates 2000 by Keith Underwood.
 
 	This software may be used and distributed according to the terms of 
-	the GNU Public License (GPL), incorporated herein by reference.
+	the GNU General Public License (GPL), incorporated herein by reference.
 	Drivers based on or derived from this code fall under the GPL and must
 	retain the authorship, copyright and license notice.  This file is not
 	a complete program and may only be used when the entire operating
@@ -159,7 +159,7 @@
 #include <linux/ptrace.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <linux/pci.h>
 #include <linux/init.h>