Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke...

[safe/jmp/linux-2.6] / fs / 9p / Makefile

diff --git a/fs/9p/Makefile b/fs/9p/Makefile
index 2f4ce43..1a940ec 100644 (file)
--- a/fs/9p/Makefile
+++ b/fs/9p/Makefile
@@ -1,18 +1,13 @@
-obj-$(CONFIG_9P_FS) := 9p2000.o
+obj-$(CONFIG_9P_FS) := 9p.o
 
-9p2000-objs := \
-       trans_fd.o \
-       trans_sock.o \
-       mux.o \
-       9p.o \
-       conv.o \
+9p-objs := \
        vfs_super.o \
        vfs_inode.o \
        vfs_addr.o \
        vfs_file.o \
        vfs_dir.o \
        vfs_dentry.o \
-       error.o \
        v9fs.o \
        fid.o
 
+9p-$(CONFIG_9P_FSCACHE) += cache.o