diff --git a/[refs] b/[refs]
index 9c828a0e052f..94109c311d6b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 86c747d2a4f028fe2fdf091c3a81d0e187827682
+refs/heads/master: 7b1fff7e4fdf2805fce7afd6247912588d72d604
diff --git a/trunk/fs/ocfs2/Kconfig b/trunk/fs/ocfs2/Kconfig
index ab152c00cd3a..77a8de5f7119 100644
--- a/trunk/fs/ocfs2/Kconfig
+++ b/trunk/fs/ocfs2/Kconfig
@@ -1,7 +1,6 @@
 config OCFS2_FS
 	tristate "OCFS2 file system support"
-	depends on NET && SYSFS
-	select CONFIGFS_FS
+	depends on NET && SYSFS && CONFIGFS_FS
 	select JBD2
 	select CRC32
 	select QUOTA