diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2009-05-22 14:25:34 -0400 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-05-22 14:25:34 -0400 |
| commit | e4b636366c00738b9609cda307014d71b1225b7f (patch) | |
| tree | 760b67b3624eda62e943e48ce93635c30a5b47bf /fs/squashfs/Makefile | |
| parent | b9ed7252d219c1c663944bf03846eabb515dbe75 (diff) | |
| parent | 279e677faa775ad16e75c32e1bf4a37f8158bc61 (diff) | |
Merge branch 'master' into for-2.6.31
Conflicts:
drivers/block/hd.c
drivers/block/mg_disk.c
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'fs/squashfs/Makefile')
| -rw-r--r-- | fs/squashfs/Makefile | 1 |
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 @@ | |||
| 5 | obj-$(CONFIG_SQUASHFS) += squashfs.o | 5 | obj-$(CONFIG_SQUASHFS) += squashfs.o |
| 6 | squashfs-y += block.o cache.o dir.o export.o file.o fragment.o id.o inode.o | 6 | squashfs-y += block.o cache.o dir.o export.o file.o fragment.o id.o inode.o |
| 7 | squashfs-y += namei.o super.o symlink.o | 7 | squashfs-y += namei.o super.o symlink.o |
| 8 | #squashfs-y += squashfs2_0.o | ||