patch-2.4.10 linux/drivers/net/lp486e.c

Next file: linux/drivers/net/macsonic.c
Previous file: linux/drivers/net/jazzsonic.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.9/linux/drivers/net/lp486e.c linux/drivers/net/lp486e.c
@@ -7,7 +7,7 @@
         Written 1993 by Donald Becker.
         Copyright 1993 United States Government as represented by the Director,
         National Security Agency.  This software may only be used and
-	distributed according to the terms of the GNU Public License
+	distributed according to the terms of the GNU General Public License
 	as modified by SRC, incorporated herein by reference.
 
         The author may be reached as becker@scyld.com, or C/O
@@ -67,7 +67,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/netdevice.h>
 #include <linux/etherdevice.h>

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)