Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6

[powerpc.git] / net / 9p / Makefile

diff --git a/net/9p/Makefile b/net/9p/Makefile
index ac46cb9..85b3a78 100644 (file)
--- a/net/9p/Makefile
+++ b/net/9p/Makefile
@@ -1,6 +1,6 @@
-obj-$(CONFIG_NET_9P) := 9p.o
+obj-$(CONFIG_NET_9P) := 9pnet.o
 
-9p-objs := \
+9pnet-objs := \
        mod.o \
        trans_fd.o \
        mux.o \
@@ -10,4 +10,4 @@ obj-$(CONFIG_NET_9P) := 9p.o
        fcprint.o \
        util.o \
 
-9p-$(CONFIG_SYSCTL) += sysctl.o
+9pnet-$(CONFIG_SYSCTL) += sysctl.o