diff --git a/[refs] b/[refs] index abea51074f2a..3643ecd0f701 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fffb47b80e8bb3f171ef02b90b1ae22c63983979 +refs/heads/master: e5d287539dba264a1d9d7607a25b8c8c61c9d658 diff --git a/trunk/fs/squashfs/Makefile b/trunk/fs/squashfs/Makefile index 8258cf9a0317..70e3244fa30f 100644 --- a/trunk/fs/squashfs/Makefile +++ b/trunk/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