patch-2.4.2 linux/arch/ppc/8260_io/fcc_enet.c

• Lines: 18
• Date: Fri Feb 16 16:02:34 2001
• Orig file: v2.4.1/linux/arch/ppc/8260_io/fcc_enet.c
• Orig date: Sat Feb 3 19:51:22 2001

diff -u --recursive --new-file v2.4.1/linux/arch/ppc/8260_io/fcc_enet.c linux/arch/ppc/8260_io/fcc_enet.c
@@ -23,7 +23,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>
@@ -46,7 +46,7 @@
 #define TX_TIMEOUT	(2*HZ)
 
 /* The number of Tx and Rx buffers.  These are allocated from the page
- * pool.  The code may assume these are power of two, so it it best
+ * pool.  The code may assume these are power of two, so it is best
  * to keep them that size.
  * We don't need to allocate pages for the transmitter.  We just use
  * the skbuffer directly.