summaryrefslogtreecommitdiffstats
path: root/drivers/net/sdlamain.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-02-15 02:15:32 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-02-15 02:15:32 +0000
commit86464aed71025541805e7b1515541aee89879e33 (patch)
treee01a457a4912a8553bc65524aa3125d51f29f810 /drivers/net/sdlamain.c
parent88f99939ecc6a95a79614574cb7d95ffccfc3466 (diff)
Merge with Linux 2.2.1.
Diffstat (limited to 'drivers/net/sdlamain.c')
-rw-r--r--drivers/net/sdlamain.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/net/sdlamain.c b/drivers/net/sdlamain.c
index 00454c5d6..3c7eef8c2 100644
--- a/drivers/net/sdlamain.c
+++ b/drivers/net/sdlamain.c
@@ -29,10 +29,6 @@
* Jan 02, 1997 Gene Kozin Initial version.
*****************************************************************************/
-#if !defined(__KERNEL__) || !defined(MODULE)
-#error This code MUST be compiled as a kernel module!
-#endif
-
#include <linux/config.h> /* OS configuration options */
#include <linux/stddef.h> /* offsetof(), etc. */
#include <linux/errno.h> /* return codes */
@@ -122,7 +118,12 @@ static struct tq_struct sdla_tq =
* < 0 error.
* Context: process
*/
+
+#ifdef MODULE
int init_module (void)
+#else
+int wanpipe_init(void)
+#endif
{
int cnt, err = 0;
@@ -173,6 +174,7 @@ int init_module (void)
return err;
}
+#ifdef MODULE
/*============================================================================
* Module 'remove' entry point.
* o unregister all adapters from the WAN router
@@ -190,6 +192,8 @@ void cleanup_module (void)
kfree(card_array);
}
+#endif
+
/******* WAN Device Driver Entry Points *************************************/
/*============================================================================