Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux-2.6-omap-h63xx.git] / fs / 9p / Makefile

diff --git a/fs/9p/Makefile b/fs/9p/Makefile
index e4e4ffe5a7dc5068a8461022d5f1282fef37bc3b..87897f84dfb6300a5f9ccce73f59f97d77c7a73e 100644 (file)
--- a/fs/9p/Makefile
+++ b/fs/9p/Makefile
@@ -1,17 +1,18 @@
-obj-$(CONFIG_9P_FS) := 9p2000.o
+obj-$(CONFIG_9P_FS) := 9p.o
 
-9p2000-objs := \
+9p-objs := \
+       trans_fd.o \
+       mux.o \
+       fcall.o \
+       conv.o \
        vfs_super.o \
        vfs_inode.o \
+       vfs_addr.o \
        vfs_file.o \
        vfs_dir.o \
        vfs_dentry.o \
        error.o \
-       mux.o \
-       trans_fd.o \
-       trans_sock.o \
-       9p.o \
-       conv.o \
        v9fs.o \
-       fid.o
+       fid.o \
+       fcprint.o