patch-2.1.36 linux/drivers/net/atari_pamsnet.c

• Lines: 55
• Date: Tue Apr 22 22:42:48 1997
• Orig file: v2.1.35/linux/drivers/net/atari_pamsnet.c
• Orig date: Fri Apr 4 08:52:20 1997

diff -u --recursive --new-file v2.1.35/linux/drivers/net/atari_pamsnet.c linux/drivers/net/atari_pamsnet.c
@@ -77,12 +77,7 @@
 static char *version =
 	"pamsnet.c:v0.2beta 30-mar-96 (c) Torsten Lang.\n";
 
-#ifdef MODULE
 #include <linux/module.h>
-#else
-#define MOD_INC_USE_COUNT
-#define MOD_DEC_USE_COUNT
-#endif
 
 #include <linux/kernel.h>
 #include <linux/sched.h>
@@ -107,6 +102,7 @@
 
 #include <linux/delay.h>
 #include <linux/timer.h>
+#include <linux/init.h>
 
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
@@ -565,8 +561,8 @@
 /* Check for a network adaptor of this type, and return '0' if one exists.
  */
 
-extern int
-pamsnet_probe (dev)
+__initfunc(extern int
+pamsnet_probe (dev))
 	struct device *dev;
 {
 	int i;
@@ -868,21 +864,12 @@
 
 #ifdef MODULE
 
-#include <linux/version.h>
-
-/* We should include the kernel identification string in the module.
- */
-static char kernel_version[] = UTS_RELEASE;
-
-#undef	NEXT_DEV
-#define NEXT_DEV	(&pam_dev)
-
 static struct device pam_dev =
 	{
 		"        ",	/* filled in by register_netdev() */
 		0, 0, 0, 0,	/* memory */
 		0, 0,		/* base, irq */
-		0, 0, 0, NEXT_DEV, pamsnet_probe,
+		0, 0, 0, NULL, pamsnet_probe,
 	};
 
 int