diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-10-20 11:26:33 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-10-20 11:26:33 -0700 |
| commit | 09147a74376428080eddfed0cbce2cab205c2508 (patch) | |
| tree | 7c903b82831eb03498dfc89c615e2acd5e1d9d6f /fs/squashfs/squashfs_fs.h | |
| parent | e4bec9707eb7446e0cd1961f91e6948819327933 (diff) | |
| parent | c2fab09b2ec32f252029757ba3353ea3d308c811 (diff) | |
Merge branch 'test/linux-linaro-lsk-v3.18-android' of git://android.git.linaro.org/kernel/linaro-android into linux-linaro-lsk-v3.18-androidlsk-v3.18-15.10-android
Diffstat (limited to 'fs/squashfs/squashfs_fs.h')
| -rw-r--r-- | fs/squashfs/squashfs_fs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/squashfs/squashfs_fs.h b/fs/squashfs/squashfs_fs.h index 4b2beda49498..506f4ba5b983 100644 --- a/fs/squashfs/squashfs_fs.h +++ b/fs/squashfs/squashfs_fs.h @@ -240,6 +240,7 @@ struct meta_index { #define LZMA_COMPRESSION 2 #define LZO_COMPRESSION 3 #define XZ_COMPRESSION 4 +#define LZ4_COMPRESSION 5 struct squashfs_super_block { __le32 s_magic; |