diff --git a/[refs] b/[refs] index dd230876e253..7f55ce38ca5d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8885074038b219b90cb0f5cd1a049ba80c7e815b +refs/heads/master: 73a98fce881c46eaeb33c1aef23ab607f4d03344 diff --git a/trunk/drivers/w1/w1.c b/trunk/drivers/w1/w1.c index acc7e3b7fe17..ad5897dc4495 100644 --- a/trunk/drivers/w1/w1.c +++ b/trunk/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 @@ static int w1_init(void) return retval; } -static void w1_fini(void) +static void __exit w1_fini(void) { struct w1_master *dev;