Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

[karo-tx-linux.git] / net / netfilter / xt_dccp.c

diff --git a/net/netfilter/xt_dccp.c b/net/netfilter/xt_dccp.c
index 2f331decd151fb6bef15a94ce9d7e1db94f26859..dfb10b648e570c0fce716bdae0644349f66357b9 100644 (file)
--- a/net/netfilter/xt_dccp.c
+++ b/net/netfilter/xt_dccp.c
@@ -164,7 +164,7 @@ static struct xt_match dccp6_match =
 };
 
 
-static int __init init(void)
+static int __init xt_dccp_init(void)
 {
        int ret;
 
@@ -191,12 +191,12 @@ out_kfree:
        return ret;
 }
 
-static void __exit fini(void)
+static void __exit xt_dccp_fini(void)
 {
        xt_unregister_match(&dccp6_match);
        xt_unregister_match(&dccp_match);
        kfree(dccp_optbuf);
 }
 
-module_init(init);
-module_exit(fini);
+module_init(xt_dccp_init);
+module_exit(xt_dccp_fini);