diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-09 15:18:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-09 15:18:49 -0800 |
| commit | 31aeb6c815549948571eec988ad9728c27d7a68d (patch) | |
| tree | e155438be253924ebb1b792182e406947369b3eb /fs/Makefile | |
| parent | c40f6f8bbc4cbd2902671aacd587400ddca62627 (diff) | |
| parent | fc55584175589b70f4c30cb594f09f4bd6ad5d40 (diff) | |
| download | linux-31aeb6c815549948571eec988ad9728c27d7a68d.tar.gz linux-31aeb6c815549948571eec988ad9728c27d7a68d.tar.bz2 linux-31aeb6c815549948571eec988ad9728c27d7a68d.zip | |
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:
MAINTAINERS: squashfs entry
Squashfs: documentation
Squashfs: initrd support
Squashfs: Kconfig entry
Squashfs: Makefiles
Squashfs: header files
Squashfs: block operations
Squashfs: cache operations
Squashfs: uid/gid lookup operations
Squashfs: fragment block operations
Squashfs: export operations
Squashfs: super block operations
Squashfs: symlink operations
Squashfs: regular file operations
Squashfs: directory readdir operations
Squashfs: directory lookup operations
Squashfs: inode operations
Diffstat (limited to 'fs/Makefile')
| -rw-r--r-- | fs/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/Makefile b/fs/Makefile index bc4e14df1082..38bc735c67ad 100644 --- a/fs/Makefile +++ b/fs/Makefile @@ -74,6 +74,7 @@ obj-$(CONFIG_JBD) += jbd/ obj-$(CONFIG_JBD2) += jbd2/ obj-$(CONFIG_EXT2_FS) += ext2/ obj-$(CONFIG_CRAMFS) += cramfs/ +obj-$(CONFIG_SQUASHFS) += squashfs/ obj-y += ramfs/ obj-$(CONFIG_HUGETLBFS) += hugetlbfs/ obj-$(CONFIG_CODA_FS) += coda/ |