summaryrefslogtreecommitdiffstats
path: root/net/lapb
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-10-09 00:00:47 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-10-09 00:00:47 +0000
commitd6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch)
treee2be02f33984c48ec019c654051d27964e42c441 /net/lapb
parent609d1e803baf519487233b765eb487f9ec227a18 (diff)
Merge with 2.3.19.
Diffstat (limited to 'net/lapb')
-rw-r--r--net/lapb/.cvsignore2
-rw-r--r--net/lapb/lapb_iface.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/net/lapb/.cvsignore b/net/lapb/.cvsignore
deleted file mode 100644
index 857dd22e9..000000000
--- a/net/lapb/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-.depend
-.*.flags
diff --git a/net/lapb/lapb_iface.c b/net/lapb/lapb_iface.c
index 23a721567..75615ee3e 100644
--- a/net/lapb/lapb_iface.c
+++ b/net/lapb/lapb_iface.c
@@ -401,7 +401,7 @@ EXPORT_SYMBOL(lapb_disconnect_request);
EXPORT_SYMBOL(lapb_data_request);
EXPORT_SYMBOL(lapb_data_received);
-__initfunc(void lapb_proto_init(struct net_proto *pro))
+void __init lapb_proto_init(struct net_proto *pro)
{
printk(KERN_INFO "NET4: LAPB for Linux. Version 0.01 for NET4.0\n");
}