Merge commit 'v2.6.37-rc1' into for-2.6.38

[~andy/linux] / fs / ocfs2 / cluster / Makefile

diff --git a/fs/ocfs2/cluster/Makefile b/fs/ocfs2/cluster/Makefile
index cdd162f13650b167dd8a9cf49db83b1e2ea5339e..bc8c5e7d8608bc027085aed634d75350071c3d80 100644 (file)
--- a/fs/ocfs2/cluster/Makefile
+++ b/fs/ocfs2/cluster/Makefile
@@ -1,4 +1,4 @@
 obj-$(CONFIG_OCFS2_FS) += ocfs2_nodemanager.o
 
 ocfs2_nodemanager-objs := heartbeat.o masklog.o sys.o nodemanager.o \
-       quorum.o tcp.o ver.o
+       quorum.o tcp.o netdebug.o ver.o