diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-23 03:13:53 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-23 03:13:53 +0200 |
commit | cbfef53360ea88fa7ef9f80def778fba9b05d21e (patch) | |
tree | 9e23ee08206ec0304e25e8a93eabc2d5bcd8ae9c /fs/fuse/control.c | |
parent | Merge 3.15-rc3 into staging-next (diff) | |
parent | Linux 3.15-rc6 (diff) | |
download | linux-cbfef53360ea88fa7ef9f80def778fba9b05d21e.tar.xz linux-cbfef53360ea88fa7ef9f80def778fba9b05d21e.zip |
Merge 3.15-rc6 into driver-core-next
We want the kernfs fixes in this branch as well for testing.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/fuse/control.c')
-rw-r--r-- | fs/fuse/control.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/fuse/control.c b/fs/fuse/control.c index a0b0855d00a9..205e0d5d5307 100644 --- a/fs/fuse/control.c +++ b/fs/fuse/control.c @@ -348,7 +348,7 @@ int __init fuse_ctl_init(void) return register_filesystem(&fuse_ctl_fs_type); } -void fuse_ctl_cleanup(void) +void __exit fuse_ctl_cleanup(void) { unregister_filesystem(&fuse_ctl_fs_type); } |