Merge tag 'nfs-for-3.18-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[firefly-linux-kernel-4.4.55.git] / net / dccp / ccid.c

diff --git a/net/dccp/ccid.c b/net/dccp/ccid.c
index 597557254ddb42dd9e58e8cb5b3594f07fc34d10..83498975165f9906b80349d58559eb36d81e0fae 100644 (file)
--- a/net/dccp/ccid.c
+++ b/net/dccp/ccid.c
@@ -99,7 +99,7 @@ static void ccid_kmem_cache_destroy(struct kmem_cache *slab)
                kmem_cache_destroy(slab);
 }
 
-static int ccid_activate(struct ccid_operations *ccid_ops)
+static int __init ccid_activate(struct ccid_operations *ccid_ops)
 {
        int err = -ENOBUFS;