From da0e6a7a9a87fd1823b92ddfea215b70960b6710 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 11 Jul 2014 21:00:57 -0700 Subject: [PATCH] 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 Cc: Oleg Drokin Cc: hpdd-discuss Signed-off-by: Greg Kroah-Hartman --- drivers/staging/lustre/lustre/libcfs/Makefile | 3 --- drivers/staging/lustre/lustre/libcfs/linux/linux-debug.c | 2 +- drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c | 2 +- drivers/staging/lustre/lustre/libcfs/linux/linux-tracefile.c | 2 +- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/staging/lustre/lustre/libcfs/Makefile b/drivers/staging/lustre/lustre/libcfs/Makefile index 6e489d7aaa8b..aeeaab73a1fd 100644 --- 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 ca2faa68cb5a..eaa423d13650 100644 --- 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 diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c index 264dc8b34648..33fd7ca69e34 100644 --- 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 -#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 f8dadd2f5607..bc38b99d8ca2 100644 --- 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] = { -- 2.39.5