diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-16 15:11:13 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-16 15:11:13 -0500 |
| commit | 5520ebd308927a3beba599a2b68fa8c52f41f43b (patch) | |
| tree | b0395c15af7d096e6e6172a9d47bb7a8dec6add0 /fs/squashfs/fragment.c | |
| parent | d3072e6a7e9bf7aca200370317f8e297be360b17 (diff) | |
| parent | 01a678c5a2f41663b8faf03d17e2bbdbf44158a9 (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: simplify CONFIG_SQUASHFS_LZO handling
Squashfs: move squashfs_i() definition from squashfs.h
Squashfs: get rid of default n in Kconfig
Squashfs: add missing check in zlib_wrapper
Squashfs: remove unnecessary variable in zlib_wrapper
Squashfs: Add XZ compression configuration option
Squashfs: add XZ compression support
Diffstat (limited to 'fs/squashfs/fragment.c')
| -rw-r--r-- | fs/squashfs/fragment.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/squashfs/fragment.c b/fs/squashfs/fragment.c index 7c90bbd6879d..7eef571443c6 100644 --- a/fs/squashfs/fragment.c +++ b/fs/squashfs/fragment.c | |||
| @@ -39,7 +39,6 @@ | |||
| 39 | 39 | ||
| 40 | #include "squashfs_fs.h" | 40 | #include "squashfs_fs.h" |
| 41 | #include "squashfs_fs_sb.h" | 41 | #include "squashfs_fs_sb.h" |
| 42 | #include "squashfs_fs_i.h" | ||
| 43 | #include "squashfs.h" | 42 | #include "squashfs.h" |
| 44 | 43 | ||
| 45 | /* | 44 | /* |