staging: lustre: remove LPLU, LPLD, and LPLX defines

[sfrench/cifs-2.6.git] / drivers / staging / lustre / include / linux / libcfs / linux / kp30.h

diff --git a/drivers/staging/lustre/include/linux/libcfs/linux/kp30.h b/drivers/staging/lustre/include/linux/libcfs/linux/kp30.h
index a09fed3c6ea848656e6d2a7598f1e2e50599ded6..a1722bd95874eb18cd05ceafa9dc6fafc9669571 100644 (file)
--- a/drivers/staging/lustre/include/linux/libcfs/linux/kp30.h
+++ b/drivers/staging/lustre/include/linux/libcfs/linux/kp30.h
@@ -37,7 +37,6 @@
 #ifndef __LIBCFS_LINUX_KP30_H__
 #define __LIBCFS_LINUX_KP30_H__
 
-
 #include <linux/kernel.h>
 #include <linux/mm.h>
 #include <linux/string.h>
@@ -67,7 +66,7 @@
 #include <linux/moduleparam.h>
 #include <linux/scatterlist.h>
 
-#include <linux/libcfs/linux/portals_compat25.h>
+#include "portals_compat25.h"
 
 /* this is a bit chunky */
 
@@ -75,19 +74,5 @@
 # define LPD64 "%lld"
 # define LPX64 "%#llx"
 # define LPX64i "%llx"
-# define LPO64 "%#llo"
-# define LPF64 "L"
-
-/*
- * long_ptr_t & ulong_ptr_t, same to "long" for gcc
- */
-# define LPLU "%lu"
-# define LPLD "%ld"
-# define LPLX "%#lx"
-
-/*
- * pid_t
- */
-# define LPPID "%d"
 
 #endif