patch-2.3.41 linux/drivers/net/sunbmac.c

• Lines: 32
• Date: Thu Jan 27 08:58:15 2000
• Orig file: v2.3.40/linux/drivers/net/sunbmac.c
• Orig date: Wed Dec 29 13:13:16 1999

diff -u --recursive --new-file v2.3.40/linux/drivers/net/sunbmac.c linux/drivers/net/sunbmac.c
@@ -1165,11 +1165,11 @@
 	bigmac_stop(bp);
 
 	/* Allocate transmit/receive descriptor DVMA block. */
-	bp->bmac_block = sbus_alloc_consistant(bp->bigmac_sdev,
+	bp->bmac_block = sbus_alloc_consistent(bp->bigmac_sdev,
 					       PAGE_SIZE,
 					       &bp->bblock_dvma);
 	if (bp->bmac_block == NULL || bp->bblock_dvma == 0) {
-		printk(KERN_ERR "BIGMAC: Cannot allocate consistant DMA.\n");
+		printk(KERN_ERR "BIGMAC: Cannot allocate consistent DMA.\n");
 		goto fail_and_cleanup;
 	}
 
@@ -1220,7 +1220,7 @@
 			sbus_iounmap(bp->tregs, TCVR_REG_SIZE);
 
 		if (bp->bmac_block)
-			sbus_free_consistant(bp->bigmac_sdev,
+			sbus_free_consistent(bp->bigmac_sdev,
 					     PAGE_SIZE,
 					     bp->bmac_block,
 					     bp->bblock_dvma);
@@ -1301,7 +1301,7 @@
 		sbus_iounmap(bp->creg, CREG_REG_SIZE);
 		sbus_iounmap(bp->bregs, BMAC_REG_SIZE);
 		sbus_iounmap(bp->tregs, TCVR_REG_SIZE);
-		sbus_free_consistant(bp->bigmac_sdev,
+		sbus_free_consistent(bp->bigmac_sdev,
 				     PAGE_SIZE,
 				     bp->bmac_block,
 				     bp->bblock_dvma);