diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-21 15:52:04 +1100 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-21 15:52:04 +1100 |
commit | a02efb906d12c9d4eb2ab7c59049ba9545e5412d (patch) | |
tree | bf1f6467978ec63a22f42299ecac2ee7f7e73336 /net/9p/Makefile | |
parent | 84dfcb4b318463cd4883b6a19937824f49aee564 (diff) | |
parent | 2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4 (diff) | |
download | blackbird-op-linux-a02efb906d12c9d4eb2ab7c59049ba9545e5412d.tar.gz blackbird-op-linux-a02efb906d12c9d4eb2ab7c59049ba9545e5412d.zip |
Merge commit 'origin' into master
Manual merge of:
arch/powerpc/Kconfig
arch/powerpc/include/asm/page.h
Diffstat (limited to 'net/9p/Makefile')
-rw-r--r-- | net/9p/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/9p/Makefile b/net/9p/Makefile index 519219480db1..1041b7bd12e2 100644 --- a/net/9p/Makefile +++ b/net/9p/Makefile @@ -4,10 +4,9 @@ obj-$(CONFIG_NET_9P_VIRTIO) += 9pnet_virtio.o 9pnet-objs := \ mod.o \ client.o \ - conv.o \ error.o \ - fcprint.o \ util.o \ + protocol.o \ trans_fd.o \ 9pnet_virtio-objs := \ |