patch-2.3.25 linux/drivers/net/hp-plus.c

• Lines: 27
• Date: Fri Oct 29 13:20:35 1999
• Orig file: v2.3.24/linux/drivers/net/hp-plus.c
• Orig date: Wed Aug 18 11:36:42 1999

diff -u --recursive --new-file v2.3.24/linux/drivers/net/hp-plus.c linux/drivers/net/hp-plus.c
@@ -361,7 +361,7 @@
 
 	outw((ring_page<<8), ioaddr + HPP_IN_ADDR);
 	outw(option_reg & ~(MemDisable + BootROMEnb), ioaddr + HPP_OPTION);
-	memcpy_fromio(hdr, dev->mem_start, sizeof(struct e8390_pkt_hdr));
+	isa_memcpy_fromio(hdr, dev->mem_start, sizeof(struct e8390_pkt_hdr));
 	outw(option_reg, ioaddr + HPP_OPTION);
 	hdr->count = (hdr->count + 3) & ~3;	/* Round up allocation. */
 }
@@ -380,7 +380,7 @@
 	   Also note that we *can't* use eth_io_copy_and_sum() because
 	   it will not always copy "count" bytes (e.g. padded IP).  */
 
-	memcpy_fromio(skb->data, dev->mem_start, count);
+	isa_memcpy_fromio(skb->data, dev->mem_start, count);
 	outw(option_reg, ioaddr + HPP_OPTION);
 }
 
@@ -405,7 +405,7 @@
 
 	outw(start_page << 8, ioaddr + HPP_OUT_ADDR);
 	outw(option_reg & ~(MemDisable + BootROMEnb), ioaddr + HPP_OPTION);
-	memcpy_toio(dev->mem_start, buf, (count + 3) & ~3);
+	isa_memcpy_toio(dev->mem_start, buf, (count + 3) & ~3);
 	outw(option_reg, ioaddr + HPP_OPTION);
 
 	return;