Update of /cvsroot/linux-mips/linux/drivers/net
In directory usw-pr-cvs1:/tmp/cvs-serv27609/drivers/net
Modified Files:
meth.c tc35815.c
Log Message:
Removed malloc.h from a bunch of files.
Index: meth.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/net/meth.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- meth.c 28 Nov 2001 17:15:01 -0000 1.1
+++ meth.c 18 Mar 2002 22:31:38 -0000 1.2
@@ -33,7 +33,7 @@
#include <linux/sched.h>
#include <linux/kernel.h> /* printk() */
#include <linux/delay.h>
-#include <linux/malloc.h> /* kmalloc() */
+#include <linux/slab.h>
#include <linux/errno.h> /* error codes */
#include <linux/types.h> /* size_t */
#include <linux/interrupt.h> /* mark_bh */
Index: tc35815.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/net/tc35815.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- tc35815.c 7 Dec 2001 23:12:23 -0000 1.2
+++ tc35815.c 18 Mar 2002 22:31:38 -0000 1.3
@@ -41,7 +41,7 @@
#include <linux/ptrace.h>
#include <linux/ioport.h>
#include <linux/in.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
#include <linux/string.h>
#include <asm/system.h>
#include <asm/bitops.h>
@@ -398,8 +398,9 @@
struct BDesc bd[RX_BUF_PAGES];
};
-#define tc_readl(addr) readl(addr)
-#define tc_writel(d, addr) writel(d, addr)
+
+extern unsigned long tc_readl(volatile __u32 *addr);
+extern void tc_writel(unsigned long data, volatile __u32 *addr);
dma_addr_t priv_dma_handle;
|
