summaryrefslogtreecommitdiffstats
path: root/net/lapb
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-11-23 02:00:47 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-11-23 02:00:47 +0000
commit06615f62b17d7de6e12d2f5ec6b88cf30af08413 (patch)
tree8766f208847d4876a6db619aebbf54d53b76eb44 /net/lapb
parentfa9bdb574f4febb751848a685d9a9017e04e1d53 (diff)
Merge with Linux 2.4.0-test10.
Diffstat (limited to 'net/lapb')
-rw-r--r--net/lapb/lapb_iface.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/net/lapb/lapb_iface.c b/net/lapb/lapb_iface.c
index 587304bca..bdc84d72f 100644
--- a/net/lapb/lapb_iface.c
+++ b/net/lapb/lapb_iface.c
@@ -401,25 +401,18 @@ EXPORT_SYMBOL(lapb_disconnect_request);
EXPORT_SYMBOL(lapb_data_request);
EXPORT_SYMBOL(lapb_data_received);
-void __init lapb_proto_init(struct net_proto *pro)
+static int __init lapb_init(void)
{
printk(KERN_INFO "NET4: LAPB for Linux. Version 0.01 for NET4.0\n");
+ return 0;
}
#ifdef MODULE
MODULE_AUTHOR("Jonathan Naylor <g4klx@g4klx.demon.co.uk>");
MODULE_DESCRIPTION("The X.25 Link Access Procedure B link layer protocol");
+#endif
-int init_module(void)
-{
- lapb_proto_init(NULL);
- return 0;
-}
-
-void cleanup_module(void)
-{
-}
-#endif
+module_init(lapb_init);
#endif