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

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

diff -u --recursive --new-file v2.3.40/linux/drivers/net/sunlance.c linux/drivers/net/sunlance.c
@@ -1305,7 +1305,7 @@
 			sbus_iounmap((unsigned long)lp->init_block,
 				     sizeof(struct lance_init_block));
 		} else {
-			sbus_free_consistant(lp->sdev,
+			sbus_free_consistent(lp->sdev,
 					     sizeof(struct lance_init_block),
 					     (void *)lp->init_block,
 					     lp->init_block_dvma);
@@ -1375,11 +1375,11 @@
 		lp->tx = lance_tx_pio;
 	} else {
 		lp->init_block = (volatile struct lance_init_block *)
-			sbus_alloc_consistant(sdev, sizeof(struct lance_init_block),
+			sbus_alloc_consistent(sdev, sizeof(struct lance_init_block),
 					      &lp->init_block_dvma);
 		if (lp->init_block == NULL ||
 		    lp->init_block_dvma == 0) {
-			printk(KERN_ERR "%s: Cannot allocate consistant DMA memory.\n",
+			printk(KERN_ERR "%s: Cannot allocate consistent DMA memory.\n",
 			       dev->name);
 			goto fail;
 		}

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