patch-2.4.4 linux/drivers/net/defxx.c

Next file: linux/drivers/net/depca.c
Previous file: linux/drivers/net/declance.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.3/linux/drivers/net/defxx.c linux/drivers/net/defxx.c
@@ -414,14 +414,17 @@
 {
 	struct net_device *dev;
 	DFX_board_t	  *bp;			/* board pointer */
-	static int version_disp;
 	int err;
 
-	if (!version_disp)					/* display version info if adapter is found */
+#ifndef MODULE
+	static int version_disp;
+
+	if (!version_disp)	/* display version info if adapter is found */
 	{
-		version_disp = 1;				/* set display flag to TRUE so that */
-		printk(version);				/* we only display this string ONCE */
+		version_disp = 1;	/* set display flag to TRUE so that */
+		printk(version);	/* we only display this string ONCE */
 	}
+#endif
 
 	/*
 	 * init_fddidev() allocates a device structure with private data, clears the device structure and private data,
@@ -3384,6 +3387,11 @@
 static int __init dfx_init(void)
 {
 	int rc_pci, rc_eisa;
+
+/* when a module, this is printed whether or not devices are found in probe */
+#ifdef MODULE
+	printk(version);
+#endif
 
 	rc_pci = pci_module_init(&dfx_driver);
 	if (rc_pci >= 0) dfx_have_pci = 1;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)