patch-2.1.126 linux/drivers/net/via-rhine.c

Next file: linux/drivers/net/z85230.c
Previous file: linux/drivers/net/syncppp.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.125/linux/drivers/net/via-rhine.c linux/drivers/net/via-rhine.c
@@ -65,7 +65,6 @@
 #define PKT_BUF_SZ		1536			/* Size of each temporary Rx buffer.*/
 
 /* Include files, designed to support most kernel versions 2.0.0 and later. */
-#include <linux/config.h>
 #include <linux/version.h>
 #ifdef MODULE
 #ifdef MODVERSIONS
@@ -512,9 +511,8 @@
 }
 
 #ifndef MODULE
-static int via_rhine_probe(struct device *dev)
+int via_rhine_probe(struct device *dev)
 {
-	printk(KERN_INFO "%s" KERN_INFO "%s", versionA, versionB);
 	return pci_etherdev_probe(dev, pci_tbl);
 }
 #endif
@@ -523,8 +521,12 @@
 								 struct device *dev, long ioaddr, int irq,
 								 int chip_id, int card_idx)
 {
+	static int did_version = 0;		/* Already printed version info */
 	struct netdev_private *np;
 	int i, option = card_idx < MAX_UNITS ? options[card_idx] : 0;
+
+	if (debug > 0 && did_version++ == 0)
+		printk(KERN_INFO "%s" KERN_INFO "%s", versionA, versionB);
 
 	dev = init_etherdev(dev, 0);
 

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