Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

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

diff --git a/net/9p/Makefile b/net/9p/Makefile
index ac46cb91900d8a59413d0071cd0425a5c2688553..519219480db1a7080e646d612000f3f351cdcc2a 100644 (file)
--- a/net/9p/Makefile
+++ b/net/9p/Makefile
@@ -1,13 +1,14 @@
-obj-$(CONFIG_NET_9P) := 9p.o
+obj-$(CONFIG_NET_9P) := 9pnet.o
+obj-$(CONFIG_NET_9P_VIRTIO) += 9pnet_virtio.o
 
-9p-objs := \
+9pnet-objs := \
        mod.o \
-       trans_fd.o \
-       mux.o \
        client.o \
        conv.o \
        error.o \
        fcprint.o \
        util.o \
+       trans_fd.o \
 
-9p-$(CONFIG_SYSCTL) += sysctl.o
+9pnet_virtio-objs := \
+       trans_virtio.o \