Merge branch 'pm-cpuidle'

[linux-block.git] / drivers / staging / lustre / lustre / libcfs / linux / linux-proc.c

diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
index 522b28e99e41e0ad5dd12e331a738163830cd3da..fc6c9774948703bc55eef0e4f477303d8ee18eab 100644 (file)
--- a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
+++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
@@ -54,9 +54,7 @@
 
 #include <linux/fs.h>
 #include <linux/file.h>
-#include <linux/stat.h>
 #include <linux/list.h>
-#include <asm/uaccess.h>
 
 #include <linux/proc_fs.h>
 #include <linux/sysctl.h>
@@ -564,7 +562,7 @@ int insert_proc(void)
 {
 #ifdef CONFIG_SYSCTL
        if (lnet_table_header == NULL)
-               lnet_table_header = cfs_register_sysctl_table(top_table, 0);
+               lnet_table_header = register_sysctl_table(top_table);
 #endif
        return 0;
 }