diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-26 08:57:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-26 08:57:20 -0700 |
| commit | 63a6440326e4cd01d6a663069208a0e68e9b833f (patch) | |
| tree | ad3fa7a941d3eb59c4f584486cabc60247df9bdf /fs/squashfs/Makefile | |
| parent | f45471cbda9df24f990154a963741c9bd4c0b0aa (diff) | |
| parent | 899f4530334da9292556e1f8f5791468e0136ff1 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus
* git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus:
squashfs: update documentation to include description of xattr layout
squashfs: fix name reading in squashfs_xattr_get
squashfs: constify xattr handlers
squashfs: xattr fix sparse warnings
squashfs: xattr_lookup sparse fix
squashfs: add xattr support configure option
squashfs: add new extended inode types
squashfs: add support for xattr reading
squashfs: add xattr id support
Diffstat (limited to 'fs/squashfs/Makefile')
| -rw-r--r-- | fs/squashfs/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/squashfs/Makefile b/fs/squashfs/Makefile index df8a19ef870..2cee3e9fa45 100644 --- a/fs/squashfs/Makefile +++ b/fs/squashfs/Makefile @@ -5,3 +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 + |