patch-2.1.36 linux/drivers/net/3c59x.c

Next file: linux/drivers/net/8390.c
Previous file: linux/drivers/net/3c523.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.35/linux/drivers/net/3c59x.c linux/drivers/net/3c59x.c
@@ -36,6 +36,7 @@
 #include <linux/ioport.h>
 #include <linux/malloc.h>
 #include <linux/interrupt.h>
+#include <linux/init.h>
 
 #ifdef CONFIG_PCI
 #include <linux/pci.h>
@@ -84,7 +85,7 @@
 #endif
 
 #ifdef CONFIG_PCI
-static int product_ids[] = {0x5900, 0x5950, 0x5951, 0x5952, 0, 0};
+static int product_ids[] __initdata = {0x5900, 0x5950, 0x5951, 0x5952, 0, 0};
 #endif
 
 static const char *product_names[] = {
@@ -326,7 +327,7 @@
 }
 
 #else
-int tc59x_probe(struct device *dev)
+__initfunc(int tc59x_probe(struct device *dev))
 {
 	int cards_found = 0;
 
@@ -339,7 +340,7 @@
 }
 #endif  /* not MODULE */
 
-static int vortex_scan(struct device *dev)
+__initfunc(static int vortex_scan(struct device *dev))
 {
 	int cards_found = 0;
 
@@ -420,8 +421,8 @@
 	return cards_found;
 }
 
-static int vortex_found_device(struct device *dev, int ioaddr, int irq,
-							   int product_index, int options)
+__initfunc(static int vortex_found_device(struct device *dev, int ioaddr, int irq,
+							   int product_index, int options))
 {
 	struct vortex_private *vp;
 
@@ -480,7 +481,7 @@
 	return 0;
 }
 
-static int vortex_probe1(struct device *dev)
+__initfunc(static int vortex_probe1(struct device *dev))
 {
 	int ioaddr = dev->base_addr;
 	struct vortex_private *vp = (struct vortex_private *)dev->priv;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov