patch-2.1.112 linux/drivers/net/myri_sbus.c

• Lines: 29
• Date: Sun Jul 26 23:35:56 1998
• Orig file: v2.1.111/linux/drivers/net/myri_sbus.c
• Orig date: Thu Feb 12 20:56:08 1998

diff -u --recursive --new-file v2.1.111/linux/drivers/net/myri_sbus.c linux/drivers/net/myri_sbus.c
@@ -1044,27 +1044,11 @@
 	dev->hard_start_xmit = &myri_start_xmit;
 	dev->get_stats = &myri_get_stats;
 	dev->set_multicast_list = &myri_set_multicast;
-	dev->irq = sdev->irqs[0].pri;
+	dev->irq = sdev->irqs[0];
 	dev->dma = 0;
 
 	/* Register interrupt handler now. */
 	DET(("Requesting MYRIcom IRQ line.\n"));
-#ifdef __sparc_v9__
-	if(sparc_cpu_model == sun4u) {
-		struct devid_cookie dcookie;
-
-		dcookie.real_dev_id = dev;
-		dcookie.imap = dcookie.iclr = 0;
-		dcookie.pil = -1;
-		dcookie.bus_cookie = sdev->my_bus;
-		if(request_irq(dev->irq, &myri_interrupt,
-			       (SA_SHIRQ | SA_SBUS | SA_DCOOKIE),
-			       "MyriCOM Ethernet", &dcookie)) {
-			printk("MyriCOM: Cannot register interrupt handler.\n");
-			return ENODEV;
-		}
-	} else
-#endif
 	if(request_irq(dev->irq, &myri_interrupt,
 		       SA_SHIRQ, "MyriCOM Ethernet", (void *) dev)) {
 		printk("MyriCOM: Cannot register interrupt handler.\n");