[Linux-mips-commits]CVS: linux/drivers/net sb1250-mac.c,1.2,1.3

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/drivers/net
In directory usw-pr-cvs1:/tmp/cvs-serv3535/drivers/net

Modified Files:
	sb1250-mac.c 
Log Message:
More OSS syncing..



Index: sb1250-mac.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/net/sb1250-mac.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sb1250-mac.c	12 Feb 2002 17:58:28 -0000	1.2
+++ sb1250-mac.c	21 Apr 2002 20:01:14 -0000	1.3
@@ -53,6 +53,7 @@
 #error  You must compile this driver with "-O".
 #endif
 
+#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
@@ -65,8 +66,8 @@
 #include <linux/skbuff.h>
 #include <linux/slab.h>
 #include <linux/init.h>
[...977 lines suppressed...]
 	spin_unlock_irqrestore(&sc->sbm_lock, flags);
 	
@@ -2548,15 +2418,13 @@
 	
 	free_irq(dev->irq, dev);
 	
-	sbdma_emptyring(&(sc->sbm_txdma));
-	sbdma_emptyring(&(sc->sbm_rxdma));
+	sbdma_emptyring(&sc->sbm_txdma);
+	sbdma_emptyring(&sc->sbm_rxdma);
 	
 	MOD_DEC_USE_COUNT;
 	
 	return 0;
 }
-
-
 
 #if defined(SBMAC_ETH0_HWADDR) || defined(SBMAC_ETH1_HWADDR) || defined(SBMAC_ETH2_HWADDR)
 static void