Merge git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6

[linux-2.6] / fs / dlm / main.c

diff --git a/fs/dlm/main.c b/fs/dlm/main.c
index 81bf4cb2203344454a83a292f0483d04ab7801a9..162fbae58fe556df3150f96a8423718e47261d9a 100644 (file)
--- a/fs/dlm/main.c
+++ b/fs/dlm/main.c
@@ -14,8 +14,8 @@
 #include "dlm_internal.h"
 #include "lockspace.h"
 #include "lock.h"
+#include "user.h"
 #include "memory.h"
-#include "lowcomms.h"
 #include "config.h"
 
 #ifdef CONFIG_DLM_DEBUG
@@ -46,7 +46,7 @@ static int __init init_dlm(void)
        if (error)
                goto out_config;
 
-       error = dlm_lowcomms_init();
+       error = dlm_user_init();
        if (error)
                goto out_debug;
 
@@ -68,7 +68,7 @@ static int __init init_dlm(void)
 
 static void __exit exit_dlm(void)
 {
-       dlm_lowcomms_exit();
+       dlm_user_exit();
        dlm_config_exit();
        dlm_memory_exit();
        dlm_lockspace_exit();