patch-2.2.18 linux/drivers/net/tulip.c

• Lines: 35
• Date: Sat Nov 18 00:52:47 2000
• Orig file: v2.2.17/drivers/net/tulip.c
• Orig date: Fri Apr 21 12:46:21 2000

diff -u --new-file --recursive --exclude-from /usr/src/exclude v2.2.17/drivers/net/tulip.c linux/drivers/net/tulip.c
@@ -126,6 +126,7 @@
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
+#include <linux/init.h>
 #include <asm/processor.h>		/* Processor type for cache alignment. */
 #include <asm/bitops.h>
 #include <asm/io.h>
@@ -320,7 +321,7 @@
 							 long ioaddr, int irq, int chip_idx, int fnd_cnt);
 };
 #ifndef CARDBUS
-static struct pci_id_info pci_tbl[] = {
+static struct pci_id_info pci_tbl[] __initdata = {
   { "Digital DC21040 Tulip",
 	0x1011, 0x0002, 0xffff, PCI_ADDR0_IO, 128, 32, tulip_probe1 },
   { "Digital DC21041 Tulip",
@@ -343,6 +344,8 @@
 	0x11AD, 0xc115, 0xffff, PCI_ADDR0_IO, 256, 32, tulip_probe1 },
   { "ADMtek AN981 Comet",
 	0x1317, 0x0981, 0xffff, PCI_ADDR0_IO, 256, 32, tulip_probe1 },
+  { "ADMtek AN985 Comet",
+	0x1317, 0x0985, 0xffff, PCI_ADDR0_IO, 256, 32, tulip_probe1 },
   { "Compex RL100-TX",
 	0x11F6, 0x9881, 0xffff, PCI_ADDR0_IO, 128, 32, tulip_probe1 },
   { "Intel 21145 Tulip",
@@ -571,7 +574,7 @@
 static struct device *root_tulip_dev = NULL;
 
 #ifndef CARDBUS
-int tulip_probe(struct device *dev)
+int __init tulip_probe(struct device *dev)
 {
 	int cards_found = 0;
 	int pci_index = 0;