patch-2.1.106 linux/drivers/net/8390.c

• Lines: 22
• Date: Tue Jun 9 22:43:52 1998
• Orig file: v2.1.105/linux/drivers/net/8390.c
• Orig date: Tue Jun 9 11:57:29 1998

diff -u --recursive --new-file v2.1.105/linux/drivers/net/8390.c linux/drivers/net/8390.c
@@ -334,7 +334,6 @@
 	}
     
 	dev->interrupt = 1;
-	sti();
     
 	/* Change to page 0 and read the intr status reg. */
 	outb_p(E8390_NODMA+E8390_PAGE0, e8390_base + E8390_CMD);
@@ -850,8 +849,11 @@
   		outb_p(E8390_RXCONFIG, e8390_base + EN0_RXCR);
 }
 
-/* Initialize the rest of the 8390 device structure. */
-__initfunc(int ethdev_init(struct device *dev))
+/*
+ * Initialize the rest of the 8390 device structure.  Do NOT __initfunc
+ * this, as it is used by 8390 based modular drivers too.
+ */
+int ethdev_init(struct device *dev)
 {
 	if (ei_debug > 1)
 		printk(version);