diff --git a/[refs] b/[refs]
index 80f51be29250..bcc5cd92fd86 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f696a3659fc4b3a3bf4bc83d9dbec5e5a2ffd929
+refs/heads/master: 2c512397ca060f6dbcb3957174a91e29a3b769be
diff --git a/trunk/fs/Kconfig b/trunk/fs/Kconfig
index e46297f020c1..522469a7eca3 100644
--- a/trunk/fs/Kconfig
+++ b/trunk/fs/Kconfig
@@ -22,9 +22,10 @@ source "fs/jbd2/Kconfig"
 config FS_MBCACHE
 # Meta block cache for Extended Attributes (ext2/ext3/ext4)
 	tristate
-	depends on EXT2_FS_XATTR || EXT3_FS_XATTR || EXT4_FS_XATTR
-	default y if EXT2_FS=y || EXT3_FS=y || EXT4_FS=y
-	default m if EXT2_FS=m || EXT3_FS=m || EXT4_FS=m
+	default y if EXT2_FS=y && EXT2_FS_XATTR
+	default y if EXT3_FS=y && EXT3_FS_XATTR
+	default y if EXT4_FS=y && EXT4_FS_XATTR
+	default m if EXT2_FS_XATTR || EXT3_FS_XATTR || EXT4_FS_XATTR
 
 config REISERFS_FS
 	tristate "Reiserfs support"