diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-23 12:04:01 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-23 12:04:01 -0700 |
commit | 01e7ae8c13bb06a2ce622ebace33bb7e28ef596c (patch) | |
tree | 3dcaf08b5268e1602c6e6bc85870ebbc2f927856 /net/9p/Makefile | |
parent | 117636092a87a28a013a4acb5de5492645ed620f (diff) | |
parent | 22150c4f0f02619c256f35db2f1ec912549b4ca5 (diff) | |
download | op-kernel-dev-01e7ae8c13bb06a2ce622ebace33bb7e28ef596c.zip op-kernel-dev-01e7ae8c13bb06a2ce622ebace33bb7e28ef596c.tar.gz |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
9p: v9fs_vfs_rename incorrect clunk order
9p: fix memleak in fs/9p/v9fs.c
9p: add virtio transport
Diffstat (limited to 'net/9p/Makefile')
-rw-r--r-- | net/9p/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/9p/Makefile b/net/9p/Makefile index 5059bc0..d3abb24 100644 --- a/net/9p/Makefile +++ b/net/9p/Makefile @@ -1,5 +1,6 @@ obj-$(CONFIG_NET_9P) := 9pnet.o obj-$(CONFIG_NET_9P_FD) += 9pnet_fd.o +obj-$(CONFIG_NET_9P_VIRTIO) += 9pnet_virtio.o 9pnet-objs := \ mod.o \ @@ -12,3 +13,6 @@ obj-$(CONFIG_NET_9P_FD) += 9pnet_fd.o 9pnet_fd-objs := \ trans_fd.o \ + +9pnet_virtio-objs := \ + trans_virtio.o \ |