git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4a2f0ac)
[PATCH] v9fs: consolidate trans_sock into trans_fd
authorRuss Cox <rsc@swtch.com>
Sat, 25 Mar 2006 11:07:23 +0000 (03:07 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 25 Mar 2006 16:22:54 +0000 (08:22 -0800)
Here is a new trans_fd.c that replaces the current trans_fd.c and
trans_sock.c.

Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
fs/9p/Makefile patch | blob | history
fs/9p/trans_fd.c patch | blob | history
fs/9p/trans_sock.c [deleted file] patch | blob | history

diff --git a/fs/9p/Makefile b/fs/9p/Makefile
index 2f4ce43..5db5af9 100644 (file)
--- a/fs/9p/Makefile
+++ b/fs/9p/Makefile
@@ -2,7 +2,6 @@ obj-$(CONFIG_9P_FS) := 9p2000.o
 
 9p2000-objs := \
        trans_fd.o \
-       trans_sock.o \
        mux.o \
        9p.o \
        conv.o \
diff --cc fs/9p/trans_fd.c
Simple merge
diff --cc fs/9p/trans_sock.c
Simple merge
Pandora Kernel Repository