diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-10-06 13:02:30 (GMT) |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-10-06 13:02:34 (GMT) |
commit | d9b2002c406011164f245de7a81304625989f1c9 (patch) | |
tree | a2bb74773cd1409acbec5eb2fbba2ae9889d55e8 /fs/9p/Makefile | |
parent | c3b32fcbc7f4fd9a9b84718b991b175b0fd53f8c (diff) | |
parent | 906010b2134e14a2e377decbadd357b3d0ab9c6a (diff) | |
download | linux-fsl-qoriq-d9b2002c406011164f245de7a81304625989f1c9.tar.xz |
Merge branch 'perf/urgent' into perf/core
Merge reason: Upcoming patch is dependent on a fix in perf/urgent.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/9p/Makefile')
-rw-r--r-- | fs/9p/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/9p/Makefile b/fs/9p/Makefile index bc7f0d1..1a940ec 100644 --- a/fs/9p/Makefile +++ b/fs/9p/Makefile @@ -8,5 +8,6 @@ obj-$(CONFIG_9P_FS) := 9p.o vfs_dir.o \ vfs_dentry.o \ v9fs.o \ - fid.o \ + fid.o +9p-$(CONFIG_9P_FSCACHE) += cache.o |