staging: lustre: remove LPD64 define

Just use the proper modifier type...

Cc: Andreas Dilger <andreas.dilger@intel.com>
Cc: Oleg Drokin <oleg.drokin@intel.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 cba961269b1f5686c380d56c84c55050c94d71e2..0b54e562f8baf687facff507d3905f66eb6e7730 100644 (file)
--- a/drivers/staging/lustre/include/linux/libcfs/linux/kp30.h
+++ b/drivers/staging/lustre/include/linux/libcfs/linux/kp30.h
@@ -71,7 +71,6 @@
 /* this is a bit chunky */
 
 # define LPU64 "%llu"
-# define LPD64 "%lld"
 # define LPX64 "%#llx"
 
 #endif

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

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

diff --cc drivers/staging/lustre/lustre/lov/lov_pack.c
Simple merge

diff --cc drivers/staging/lustre/lustre/mgc/mgc_request.c
Simple merge

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

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

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

diff --cc drivers/staging/lustre/lustre/osc/osc_request.c
Simple merge

diff --cc drivers/staging/lustre/lustre/ptlrpc/import.c
Simple merge

diff --cc drivers/staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c
Simple merge

diff --cc drivers/staging/lustre/lustre/ptlrpc/niobuf.c
Simple merge

diff --cc drivers/staging/lustre/lustre/ptlrpc/pack_generic.c
Simple merge

diff --cc drivers/staging/lustre/lustre/ptlrpc/service.c
Simple merge