staging/lustre: remove INIT_CTL_NAME

legacy code used to support kernel where struct ctl_table
has ctl_name member.

Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Peng Tao <bergwolf@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/include/linux/libcfs/linux/kp30.h b/drivers/staging/lustre/include/linux/libcfs/linux/kp30.h
index e6f03c7..ba78541 100644 (file)
--- a/drivers/staging/lustre/include/linux/libcfs/linux/kp30.h
+++ b/drivers/staging/lustre/include/linux/libcfs/linux/kp30.h
@@ -206,7 +206,6 @@ extern int  lwt_snapshot (cfs_cycles_t *now, int *ncpu, int *total_size,
 
 /* compat macroses */
 
-#define INIT_CTL_NAME(a)
 #define INIT_STRATEGY(a)
 
 #endif

diff --cc drivers/staging/lustre/lnet/lnet/router_proc.c
Simple merge

diff --cc drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
Simple merge

diff --cc drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c
Simple merge