Merge branches 'release', 'cpuidle-2.6.25' and 'idle' into release

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

diff --git a/net/9p/Makefile b/net/9p/Makefile
index 85b3a78..8a10511 100644 (file)
--- a/net/9p/Makefile
+++ b/net/9p/Makefile
@@ -1,13 +1,17 @@
 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 \
-       trans_fd.o \
-       mux.o \
        client.o \
        conv.o \
        error.o \
        fcprint.o \
        util.o \
 
-9pnet-$(CONFIG_SYSCTL) += sysctl.o
+9pnet_fd-objs := \
+       trans_fd.o \
+
+9pnet_virtio-objs := \
+       trans_virtio.o \