4 files changed, 13 insertions, 18 deletions
diff --git a/net/802/llc_macinit.c b/net/802/llc_macinit.c
index 792bfd5e8..987d8a5c4 100644
--- a/net/802/llc_macinit.c
+++ b/net/802/llc_macinit.c
@@ -204,24 +204,11 @@ EXPORT_SYMBOL(llc_cancel_timers);
 
 #define ALL_TYPES_8022 0
 
-void __init llc_init(struct net_proto *proto)
+static int __init llc_init(void)
 {
 	printk(KERN_NOTICE "IEEE 802.2 LLC for Linux 2.1 (c) 1996 Tim Alpaerts\n");
-	return;
-}
-
-#ifdef MODULE
-
-
-int init_module(void)
-{
-	llc_init(NULL);
 	return 0;
 }
 
-void cleanup_module(void)
-{
-
-}
 
-#endif
+module_init(llc_init);
diff --git a/net/802/p8022.c b/net/802/p8022.c
index 9be3100dd..41a755e88 100644
--- a/net/802/p8022.c
+++ b/net/802/p8022.c
@@ -90,12 +90,15 @@ static struct packet_type p8022_packet_type =
 EXPORT_SYMBOL(register_8022_client);
 EXPORT_SYMBOL(unregister_8022_client);
 
-void __init p8022_proto_init(struct net_proto *pro)
+static int __init p8022_init(void)
 {
 	p8022_packet_type.type=htons(ETH_P_802_2);
 	dev_add_pack(&p8022_packet_type);
+	return 0;
 }
 
+module_init(p8022_init);
+
 struct datalink_proto *register_8022_client(unsigned char type, int (*rcvfunc)(struct sk_buff *, struct net_device *, struct packet_type *))
 {
 	struct datalink_proto	*proto;
diff --git a/net/802/psnap.c b/net/802/psnap.c
index 3c493d7d9..907ac1b54 100644
--- a/net/802/psnap.c
+++ b/net/802/psnap.c
@@ -89,12 +89,14 @@ static void snap_datalink_header(struct datalink_proto *dl, struct sk_buff *skb,
 EXPORT_SYMBOL(register_snap_client);
 EXPORT_SYMBOL(unregister_snap_client);
 
-void __init snap_proto_init(struct net_proto *pro)
+static int __init snap_init(void)
 {
 	snap_dl=register_8022_client(0xAA, snap_rcv);
 	if(snap_dl==NULL)
 		printk("SNAP - unable to register with 802.2\n");
+	return 0;
 }
+module_init(snap_init);
 
 /*
  *	Register SNAP clients. We don't yet use this for IP.
diff --git a/net/802/tr.c b/net/802/tr.c
index 097929257..73c938486 100644
--- a/net/802/tr.c
+++ b/net/802/tr.c
@@ -540,7 +540,7 @@ static int rif_get_info(char *buffer,char **start, off_t offset, int length)
  *	too much for this.
  */
 
-void __init rif_init(struct net_proto *unused)
+static int __init rif_init(void)
 {
 	rif_timer.expires  = RIF_TIMEOUT;
 	rif_timer.data     = 0L;
@@ -549,4 +549,7 @@ void __init rif_init(struct net_proto *unused)
 	add_timer(&rif_timer);
 
 	proc_net_create("tr_rif",0,rif_get_info);
+	return 0;
 }
+
+module_init(rif_init);