diff --git a/[refs] b/[refs]
index 1891345cdc7a..7a4b8b17564a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de69e5f44ecbf1d9faca4f473f4210473d26cd41
+refs/heads/master: 538524aed09fd2c52094afadf0160cef8954d4c8
diff --git a/trunk/fs/xfs/Kconfig b/trunk/fs/xfs/Kconfig
index 8e8f32dabe53..bac27d66151d 100644
--- a/trunk/fs/xfs/Kconfig
+++ b/trunk/fs/xfs/Kconfig
@@ -24,7 +24,7 @@ config XFS_EXPORT
 	default y
 
 config XFS_QUOTA
-	tristate "XFS Quota support"
+	bool "XFS Quota support"
 	depends on XFS_FS
 	help
 	  If you say Y here, you will be able to set limits for disk usage on