diff options
| author |   Jiri Kosina <jkosina@suse.cz> | 2014-02-20 14:54:28 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2014-02-20 14:54:28 +0100 |
| commit | d4263348f796f29546f90802177865dd4379dd0a (patch) | |
| tree | adcbdaebae584eee2f32fab95e826e8e49eef385 /drivers/staging/lustre/lustre/fid/Makefile | |
| parent | Documentation: update URL to hfsplus Technote 1150 (diff) | |
| parent | Linux 3.14-rc3 (diff) | |
| download | linux-dev-d4263348f796f29546f90802177865dd4379dd0a.tar.xz linux-dev-d4263348f796f29546f90802177865dd4379dd0a.zip | |
Merge branch 'master' into for-next
Diffstat (limited to 'drivers/staging/lustre/lustre/fid/Makefile')
| -rw-r--r-- | drivers/staging/lustre/lustre/fid/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/staging/lustre/lustre/fid/Makefile b/drivers/staging/lustre/lustre/fid/Makefile index ed21bea162ba..d24f2df7c0af 100644 --- a/drivers/staging/lustre/lustre/fid/Makefile +++ b/drivers/staging/lustre/lustre/fid/Makefile @@ -1,5 +1,6 @@ obj-$(CONFIG_LUSTRE_FS) += fid.o -fid-y := fid_request.o lproc_fid.o fid_lib.o +fid-y := fid_request.o fid_lib.o +fid-$(CONFIG_PROC_FS) += lproc_fid.o ccflags-y := -I$(src)/../include |