diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-10-08 10:40:34 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-10-08 10:40:34 +0200 |
| commit | edfbeecd92b0c4a648ed96a7e255bfc9a1bc4642 (patch) | |
| tree | efdfc57e2520886842a27f2c9978c83d968ba709 /lib | |
| parent | c808c09b527cd60d9a0d53799935f75e2452174d (diff) | |
| parent | fb1c592cf4c9eeb84ec6bce13c13c11c7d05b6c7 (diff) | |
Merge branch 'linus' into x86/asm, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/xz/xz_crc32.c | 1 | ||||
| -rw-r--r-- | lib/xz/xz_private.h | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lib/xz/xz_crc32.c b/lib/xz/xz_crc32.c index 25a5d87e2e4c..912aae5fa09e 100644 --- a/lib/xz/xz_crc32.c +++ b/lib/xz/xz_crc32.c @@ -15,7 +15,6 @@ * but they are bigger and use more memory for the lookup table. */ -#include <linux/crc32poly.h> #include "xz_private.h" /* diff --git a/lib/xz/xz_private.h b/lib/xz/xz_private.h index 482b90f363fe..09360ebb510e 100644 --- a/lib/xz/xz_private.h +++ b/lib/xz/xz_private.h @@ -102,6 +102,10 @@ # endif #endif +#ifndef CRC32_POLY_LE +#define CRC32_POLY_LE 0xedb88320 +#endif + /* * Allocate memory for LZMA2 decoder. xz_dec_lzma2_reset() must be used * before calling xz_dec_lzma2_run(). |
