---

yaml --- r: 208871 b: refs/heads/master c: 637d5c9 h: refs/heads/master i: 208869: 203fc57 208867: e66a2f7 208863: ab0a748 v: v3
git-mirror · May 31, 2010 · 5a4e492 · 5a4e492
1 parent 2d42cd5
commit 5a4e492
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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 *,