aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2006-09-27 12:20:06 -0400
committerSteven Whitehouse <swhiteho@redhat.com>2006-09-27 12:20:06 -0400
commit7e18c02be7c83a8cfd1319f0117f63509c20aa8e (patch)
tree1a80f5eb508aadd0a4c9dbc4476263f0f4b93548
parent5e96f59f9b20373014abd5e30fba4805c5d4f53f (diff)
[GFS2] Fix bug in Makefiles for lock modules
The Makefile had the wrong CONFIG_ variable in it so that in case GFS2 was y and the lock modules were m, they were not getting built properly. Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
-rw-r--r--fs/gfs2/locking/dlm/Makefile2
-rw-r--r--fs/gfs2/locking/nolock/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/gfs2/locking/dlm/Makefile b/fs/gfs2/locking/dlm/Makefile
index a9733ff8037..89b93b6b45c 100644
--- a/fs/gfs2/locking/dlm/Makefile
+++ b/fs/gfs2/locking/dlm/Makefile
@@ -1,3 +1,3 @@
-obj-$(CONFIG_GFS2_FS) += lock_dlm.o
+obj-$(CONFIG_GFS2_FS_LOCKING_DLM) += lock_dlm.o
lock_dlm-y := lock.o main.o mount.o sysfs.o thread.o plock.o
diff --git a/fs/gfs2/locking/nolock/Makefile b/fs/gfs2/locking/nolock/Makefile
index cdadf956c83..35e9730bc3a 100644
--- a/fs/gfs2/locking/nolock/Makefile
+++ b/fs/gfs2/locking/nolock/Makefile
@@ -1,3 +1,3 @@
-obj-$(CONFIG_GFS2_FS) += lock_nolock.o
+obj-$(CONFIG_GFS2_FS_LOCKING_NOLOCK) += lock_nolock.o
lock_nolock-y := main.o