Merge branch 'viafb-next' of git://github.com/schandinat/linux-2.6

[mirror_ubuntu-artful-kernel.git] / fs / coda / sysctl.c

diff --git a/fs/coda/sysctl.c b/fs/coda/sysctl.c
index c6405ce3c50ecb92f3b800b3f750dd96835d41f9..06d27a41807fb5be7f9f6eb65f227140205b4f77 100644 (file)
--- a/fs/coda/sysctl.c
+++ b/fs/coda/sysctl.c
@@ -13,7 +13,6 @@
 
 #ifdef CONFIG_SYSCTL
 static struct ctl_table_header *fs_table_header;
-#endif
 
 static ctl_table coda_table[] = {
        {
@@ -40,7 +39,6 @@ static ctl_table coda_table[] = {
        {}
 };
 
-#ifdef CONFIG_SYSCTL
 static ctl_table fs_table[] = {
        {
                .procname       = "coda",
@@ -49,22 +47,18 @@ static ctl_table fs_table[] = {
        },
        {}
 };
-#endif
 
 void coda_sysctl_init(void)
 {
-#ifdef CONFIG_SYSCTL
        if ( !fs_table_header )
                fs_table_header = register_sysctl_table(fs_table);
-#endif
 }
 
 void coda_sysctl_clean(void)
 {
-#ifdef CONFIG_SYSCTL
        if ( fs_table_header ) {
                unregister_sysctl_table(fs_table_header);
                fs_table_header = NULL;
        }
-#endif
 }
+#endif