diff --git a/[refs] b/[refs]
index 2df1cd667f87..6650e33e6270 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a02956e4cc655f746134806119cce1bccfc2c610
+refs/heads/master: 637d5c9a36bcb2b101401d52191ff3c7580f9068
diff --git a/trunk/fs/squashfs/Kconfig b/trunk/fs/squashfs/Kconfig
index cc6ce8a84c21..3e9ee95ef37d 100644
--- a/trunk/fs/squashfs/Kconfig
+++ b/trunk/fs/squashfs/Kconfig
@@ -26,7 +26,7 @@ config SQUASHFS
 
 	  If unsure, say N.
 
-config SQUASHFS_XATTRS
+config SQUASHFS_XATTR
 	bool "Squashfs XATTR support"
 	depends on SQUASHFS
 	default n
diff --git a/trunk/fs/squashfs/Makefile b/trunk/fs/squashfs/Makefile
index 2cee3e9fa452..6fa6b9deecd3 100644
--- a/trunk/fs/squashfs/Makefile
+++ b/trunk/fs/squashfs/Makefile
@@ -5,5 +5,5 @@
 obj-$(CONFIG_SQUASHFS) += squashfs.o
 squashfs-y += block.o cache.o dir.o export.o file.o fragment.o id.o inode.o
 squashfs-y += namei.o super.o symlink.o zlib_wrapper.o decompressor.o
-squashfs-$(CONFIG_SQUASHFS_XATTRS) += xattr.o xattr_id.o
+squashfs-$(CONFIG_SQUASHFS_XATTR) += xattr.o xattr_id.o
 
diff --git a/trunk/fs/squashfs/xattr.h b/trunk/fs/squashfs/xattr.h
index 9da071ae181c..49fe0d719fbf 100644
--- a/trunk/fs/squashfs/xattr.h
+++ b/trunk/fs/squashfs/xattr.h
@@ -21,7 +21,7 @@
  * xattr.h
  */
 
-#ifdef CONFIG_SQUASHFS_XATTRS
+#ifdef CONFIG_SQUASHFS_XATTR
 extern __le64 *squashfs_read_xattr_id_table(struct super_block *, u64,
 		u64 *, int *);
 extern int squashfs_xattr_lookup(struct super_block *, unsigned int, int *,