Merge branches 'release', 'acpi_pm_device_sleep_state' and 'battery' into release

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

diff --git a/net/9p/Makefile b/net/9p/Makefile
index d3abb246ccab41af3b237945f0fd520e96e451fe..8a105110189830f5b527047ac4e299462f038710 100644 (file)
--- a/net/9p/Makefile
+++ b/net/9p/Makefile
@@ -4,7 +4,6 @@ obj-$(CONFIG_NET_9P_VIRTIO) += 9pnet_virtio.o
 
 9pnet-objs := \
        mod.o \
-       mux.o \
        client.o \
        conv.o \
        error.o \