From 5a4e4927b19a0f607a3bb8c01738f86e85f4498d Mon Sep 17 00:00:00 2001
From: Phillip Lougher <phillip@lougher.demon.co.uk>
Date: Mon, 31 May 2010 18:46:29 +0100
Subject: [PATCH] --- yaml --- r: 208871 b: refs/heads/master c:
 637d5c9a36bcb2b101401d52191ff3c7580f9068 h: refs/heads/master i:   208869:
 203fc575a2f734417ee4a38b3eb4b114ba0e1182   208867:
 e66a2f76d6c50950a3f8245d7430a6650e38483a   208863:
 ab0a748fc4a3fb91c076edaa53d1e62597e8dc94 v: v3

---
 [refs]                     | 2 +-
 trunk/fs/squashfs/Kconfig  | 2 +-
 trunk/fs/squashfs/Makefile | 2 +-
 trunk/fs/squashfs/xattr.h  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

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 *,