summaryrefslogtreecommitdiff
path: root/fs/squashfs/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-05-14 03:33:25 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-05-14 03:33:25 +0400
commit210af919c949a7d6bd330916ef376cec2907d81e (patch)
treeb2d66ca5d30b807cc8a55bbc524e85406888b66c /fs/squashfs/Makefile
parenta6aeeebf5179ea6346249d727bdb9124ce9e2d4c (diff)
parente5d287539dba264a1d9d7607a25b8c8c61c9d658 (diff)
downloadlinux-210af919c949a7d6bd330916ef376cec2907d81e.tar.xz
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: cody tidying, remove commented out line in Makefile Squashfs: check page size is not larger than the filesystem block size Squashfs: fix breakage when page size > metadata block size
Diffstat (limited to 'fs/squashfs/Makefile')
-rw-r--r--fs/squashfs/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/squashfs/Makefile b/fs/squashfs/Makefile
index 8258cf9a0317..70e3244fa30f 100644
--- a/fs/squashfs/Makefile
+++ b/fs/squashfs/Makefile
@@ -5,4 +5,3 @@
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
-#squashfs-y += squashfs2_0.o