From c072edf9cd2c454cb1fa311840820386db31dd6c Mon Sep 17 00:00:00 2001 From: David Teigland Date: Tue, 17 Jan 2006 08:36:49 +0000 Subject: [PATCH] --- yaml --- r: 38575 b: refs/heads/master c: a8f2d64728d8b706392fc1cb0f2fd6852a5e27ae h: refs/heads/master i: 38573: 615c6f6c45e44e647b1dccc4f55e857f1a16b376 38571: cb7f39b79c818affe6bf955f1e5131ca80a9035b 38567: 0737c92b4845060d326e941a0258624c58abb16e 38559: 65347f0f6b57171b7bb939c91f7e41e49e73edb8 v: v3 --- [refs] | 2 +- trunk/fs/gfs2/Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0b07fb0cf56b..de9d57a0882f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 29b7998d887529eca1ef43c8ca7b278448dc983c +refs/heads/master: a8f2d64728d8b706392fc1cb0f2fd6852a5e27ae diff --git a/trunk/fs/gfs2/Makefile b/trunk/fs/gfs2/Makefile index b1bac4f199db..974c76d0c6fc 100644 --- a/trunk/fs/gfs2/Makefile +++ b/trunk/fs/gfs2/Makefile @@ -39,6 +39,6 @@ gfs2-y := \ unlinked.o \ util.o -obj-$(CONFIG_GFS2_LOCKING_NOLOCK) += locking/nolock/ -obj-$(CONFIG_GFS2_LOCKING_DLM) += locking/dlm/ +obj-$(CONFIG_GFS2_FS_LOCKING_NOLOCK) += locking/nolock/ +obj-$(CONFIG_GFS2_FS_LOCKING_DLM) += locking/dlm/