diff options
| author |   Russell King <rmk+kernel@arm.linux.org.uk> | 2015-07-07 12:35:33 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-07-07 12:35:33 +0100 |
| commit | 06be5eefe1192eb8ce8d07497f67595b6bfe9741 (patch) | |
| tree | 80f1987d4970f8079681f8be0c135cafc8d6329a /drivers/staging/lustre/lustre/fid/fid_internal.h | |
| parent | ARM: fix lockdep unannotated irqs-off warning (diff) | |
| parent | ARM: avoid unwanted GCC memset()/memcpy() optimisations for IO variants (diff) | |
| download | linux-dev-06be5eefe1192eb8ce8d07497f67595b6bfe9741.tar.xz linux-dev-06be5eefe1192eb8ce8d07497f67595b6bfe9741.zip | |
Merge branches 'fixes' and 'ioremap' into for-linus
Diffstat (limited to 'drivers/staging/lustre/lustre/fid/fid_internal.h')
| -rw-r--r-- | drivers/staging/lustre/lustre/fid/fid_internal.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/staging/lustre/lustre/fid/fid_internal.h b/drivers/staging/lustre/lustre/fid/fid_internal.h index b5e8da8956f2..84daee1154dc 100644 --- a/drivers/staging/lustre/lustre/fid/fid_internal.h +++ b/drivers/staging/lustre/lustre/fid/fid_internal.h @@ -47,10 +47,6 @@ int seq_client_alloc_super(struct lu_client_seq *seq, const struct lu_env *env); -#if defined(CONFIG_PROC_FS) -extern struct lprocfs_vars seq_client_proc_list[]; -#endif - -extern struct proc_dir_entry *seq_type_proc_dir; +extern struct lprocfs_vars seq_client_debugfs_list[]; #endif /* __FID_INTERNAL_H */ |