diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-11 22:02:26 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-11 22:02:26 -0700 |
commit | e0a30a6b7c0f67587c6d861b2fb72160ef68c730 (patch) | |
tree | 5192a1d4cdbeb6e9127999dcdcfd9acdcbae59a8 /drivers/staging/lustre/lustre/lvfs | |
parent | 0cf0f7a7222eaea376813ca6df458b85e95e60a2 (diff) |
staging: lustre: lvfs: remove ccflags from Makefile
Fix up the relative paths in the .c files to properly build with the
Makefile change.
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>
Diffstat (limited to 'drivers/staging/lustre/lustre/lvfs')
-rw-r--r-- | drivers/staging/lustre/lustre/lvfs/Makefile | 3 | ||||
-rw-r--r-- | drivers/staging/lustre/lustre/lvfs/fsfilt.c | 2 | ||||
-rw-r--r-- | drivers/staging/lustre/lustre/lvfs/lvfs_lib.c | 4 | ||||
-rw-r--r-- | drivers/staging/lustre/lustre/lvfs/lvfs_linux.c | 8 |
4 files changed, 7 insertions, 10 deletions
diff --git a/drivers/staging/lustre/lustre/lvfs/Makefile b/drivers/staging/lustre/lustre/lvfs/Makefile index e0367c3fc416..387eee307e2d 100644 --- a/drivers/staging/lustre/lustre/lvfs/Makefile +++ b/drivers/staging/lustre/lustre/lvfs/Makefile @@ -2,6 +2,3 @@ obj-$(CONFIG_LUSTRE_FS) += lvfs.o lvfs-y := lvfs_linux.o fsfilt.o lvfs-$(CONFIG_PROC_FS) += lvfs_lib.o - - -ccflags-y := -I$(src)/../include diff --git a/drivers/staging/lustre/lustre/lvfs/fsfilt.c b/drivers/staging/lustre/lustre/lvfs/fsfilt.c index 1c0fc24e6bdc..a4df056a2853 100644 --- a/drivers/staging/lustre/lustre/lvfs/fsfilt.c +++ b/drivers/staging/lustre/lustre/lvfs/fsfilt.c @@ -39,7 +39,7 @@ #include <linux/kmod.h> #include <linux/slab.h> #include "../../include/linux/libcfs/libcfs.h" -#include <lustre_fsfilt.h> +#include "../include/lustre_fsfilt.h" LIST_HEAD(fsfilt_types); diff --git a/drivers/staging/lustre/lustre/lvfs/lvfs_lib.c b/drivers/staging/lustre/lustre/lvfs/lvfs_lib.c index 7e47fc4a7e4e..cfc4f896b127 100644 --- a/drivers/staging/lustre/lustre/lvfs/lvfs_lib.c +++ b/drivers/staging/lustre/lustre/lvfs/lvfs_lib.c @@ -40,8 +40,8 @@ * Author: Andreas Dilger <adilger@clusterfs.com> */ #include <linux/module.h> -#include <lustre_lib.h> -#include <lprocfs_status.h> +#include "../include/lustre_lib.h" +#include "../include/lprocfs_status.h" void lprocfs_counter_add(struct lprocfs_stats *stats, int idx, long amount) { diff --git a/drivers/staging/lustre/lustre/lvfs/lvfs_linux.c b/drivers/staging/lustre/lustre/lvfs/lvfs_linux.c index e616873933f4..a519a5ca69ba 100644 --- a/drivers/staging/lustre/lustre/lvfs/lvfs_linux.c +++ b/drivers/staging/lustre/lustre/lvfs/lvfs_linux.c @@ -47,11 +47,11 @@ #include <linux/quotaops.h> #include <linux/module.h> #include "../../include/linux/libcfs/libcfs.h" -#include <linux/lustre_compat25.h> -#include <lvfs.h> +#include "../include/linux/lustre_compat25.h" +#include "../include/lvfs.h" -#include <obd.h> -#include <lustre_lib.h> +#include "../include/obd.h" +#include "../include/lustre_lib.h" struct lprocfs_stats *obd_memory = NULL; EXPORT_SYMBOL(obd_memory); |