staging: lustre: libcfs: remove ccflags from Makefile

There were two paths being added, yet only one was needed.  Remove both,
and fix up the 3 .c files to point to the location of the needed .h
file.

Cc: Andreas Dilger <andreas.dilger@intel.com>
Cc: Oleg Drokin <oleg.drokin@intel.com>
Cc: hpdd-discuss <hpdd-discuss@lists.01.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/lustre/libcfs/Makefile b/drivers/staging/lustre/lustre/libcfs/Makefile
index 6e489d7aaa8b33a8718f8fbc81c75209504d2cde..aeeaab73a1fd3e54e5a8d27386db1b8aa8f8f6a0 100644 (file)
--- a/drivers/staging/lustre/lustre/libcfs/Makefile
+++ b/drivers/staging/lustre/lustre/libcfs/Makefile
@@ -16,6 +16,3 @@ libcfs-all-objs := debug.o fail.o nidstrings.o module.o tracefile.o \
                   libcfs_mem.o libcfs_lock.o
 
 libcfs-objs := $(libcfs-linux-objs) $(libcfs-all-objs)
-
-ccflags-y := -I$(src)/../include
-ccflags-y += -I$(src)/

diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-debug.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-debug.c
index ca2faa68cb5aa765c224f35974980f7485d67ca2..eaa423d13650319bd53ea8c08f7adfd95fbae735 100644 (file)
--- a/drivers/staging/lustre/lustre/libcfs/linux/linux-debug.c
+++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-debug.c
@@ -58,7 +58,7 @@
 #include "../../../include/linux/libcfs/libcfs.h"
 #include "../../../include/linux/libcfs/linux/portals_compat25.h"
 
-#include "tracefile.h"
+#include "../tracefile.h"
 
 #include <linux/kallsyms.h>
 

diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
index 264dc8b34648c3718e593b77071449e38eb97f74..33fd7ca69e34abe94656704d506d24738847b614 100644 (file)
--- a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
+++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
@@ -63,7 +63,7 @@
 
 #include "../../../include/linux/libcfs/libcfs.h"
 #include <asm/div64.h>
-#include "tracefile.h"
+#include "../tracefile.h"
 
 static ctl_table_header_t *lnet_table_header = NULL;
 extern char lnet_upcall[1024];

diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-tracefile.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-tracefile.c
index f8dadd2f560779aaba15a588f251eed24227807c..bc38b99d8ca283da4e961e51113cc745ba63da83 100644 (file)
--- a/drivers/staging/lustre/lustre/libcfs/linux/linux-tracefile.c
+++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-tracefile.c
@@ -38,7 +38,7 @@
 #define LUSTRE_TRACEFILE_PRIVATE
 
 #include "../../../include/linux/libcfs/libcfs.h"
-#include "tracefile.h"
+#include "../tracefile.h"
 
 /* percents to share the total debug memory for each type */
 static unsigned int pages_factor[CFS_TCD_TYPE_MAX] = {