Merge branch 'linus' into genirq

[linux-2.6-omap-h63xx.git] / net / 9p / Makefile

diff --git a/net/9p/Makefile b/net/9p/Makefile
index d3abb246ccab41af3b237945f0fd520e96e451fe..519219480db1a7080e646d612000f3f351cdcc2a 100644 (file)
--- a/net/9p/Makefile
+++ b/net/9p/Makefile
@@ -1,17 +1,13 @@
 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 \
-       mux.o \
        client.o \
        conv.o \
        error.o \
        fcprint.o \
        util.o \
-
-9pnet_fd-objs := \
        trans_fd.o \
 
 9pnet_virtio-objs := \