From: Steven Whitehouse Date: Wed, 27 Sep 2006 16:20:06 +0000 (-0400) Subject: [GFS2] Fix bug in Makefiles for lock modules X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=7e18c02be7c83a8cfd1319f0117f63509c20aa8e;p=deliverable%2Flinux.git [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 --- diff --git a/fs/gfs2/locking/dlm/Makefile b/fs/gfs2/locking/dlm/Makefile index a9733ff80371..89b93b6b45cf 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 cdadf956c831..35e9730bc3a8 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