patch-2.1.132 linux/drivers/acorn/net/etherh.c

• Lines: 39
• Date: Thu Dec 17 09:07:45 1998
• Orig file: v2.1.131/linux/drivers/acorn/net/etherh.c
• Orig date: Tue Jul 21 00:15:30 1998

diff -u --recursive --new-file v2.1.131/linux/drivers/acorn/net/etherh.c linux/drivers/acorn/net/etherh.c
@@ -186,7 +186,7 @@
 	
 	if (ei_status.dmaing) {
 		printk ("%s: DMAing conflict in etherh_block_input: "
-			" DMAstat %d irqlock %d intr %d\n", dev->name,
+			" DMAstat %d irqlock %d intr %ld\n", dev->name,
 			ei_status.dmaing, ei_status.irqlock, dev->interrupt);
 		return;
 	}
@@ -246,7 +246,7 @@
 
 	if (ei_status.dmaing) {
 		printk ("%s: DMAing conflict in etherh_block_input: "
-			" DMAstat %d irqlock %d intr %d\n", dev->name,
+			" DMAstat %d irqlock %d intr %ld\n", dev->name,
 			ei_status.dmaing, ei_status.irqlock, dev->interrupt);
 		return;
 	}
@@ -288,7 +288,7 @@
 
 	if (ei_status.dmaing) {
 		printk ("%s: DMAing conflict in etherh_get_header: "
-			" DMAstat %d irqlock %d intr %d\n", dev->name,
+			" DMAstat %d irqlock %d intr %ld\n", dev->name,
 			ei_status.dmaing, ei_status.irqlock, dev->interrupt);
 		return;
 	}
@@ -469,9 +469,9 @@
 	ecard_claim (ec);
 	
 	dev->irq = ec->irq;
-	dev->mem_end = ec->cld.product;
+	dev->mem_end = ec->cid.product;
 
-	switch (ec->cld.product) {
+	switch (ec->cid.product) {
 	case PROD_I3_ETHERLAN500:
 		dev->base_addr = ecard_address (ec, ECARD_MEMC, 0) + ETHERH500_NS8390;
 		dev->mem_start = dev->base_addr + ETHERH500_DATAPORT;