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

[linux-2.6] / net / 9p / Makefile

diff --git a/net/9p/Makefile b/net/9p/Makefile
index 7b2a67abc0a09225873cc6663be38e68a19b90e4..d3abb246ccab41af3b237945f0fd520e96e451fe 100644 (file)
--- 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 \
@@ -10,7 +11,8 @@ obj-$(CONFIG_NET_9P_FD) += 9pnet_fd.o
        fcprint.o \
        util.o \
 
-9pnet-$(CONFIG_SYSCTL) += sysctl.o
-
 9pnet_fd-objs := \
        trans_fd.o \
+
+9pnet_virtio-objs := \
+       trans_virtio.o \