Merge branches 'ntrig', 'picolcd', 'prodikeys' and 'roccat-kone' into for-linus

[~andy/linux] / drivers / w1 / w1.c

diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c
index acc7e3b7fe17bbbe37e024bde8db85ba738f4672..ad5897dc4495278954179e73096d1c5f910310a1 100644 (file)
--- a/drivers/w1/w1.c
+++ b/drivers/w1/w1.c
@@ -986,7 +986,7 @@ int w1_process(void *data)
        return 0;
 }
 
-static int w1_init(void)
+static int __init w1_init(void)
 {
        int retval;
 
@@ -1034,7 +1034,7 @@ err_out_exit_init:
        return retval;
 }
 
-static void w1_fini(void)
+static void __exit w1_fini(void)
 {
        struct w1_master *dev;