diff options
| -rw-r--r-- | lib/decompress_unlzo.c | 2 | ||||
| -rw-r--r-- | lib/lzo/Makefile | 2 | ||||
| -rw-r--r-- | lib/lzo/lzo1x_decompress_safe.c (renamed from lib/lzo/lzo1x_decompress.c) | 0 |
3 files changed, 2 insertions, 2 deletions
diff --git a/lib/decompress_unlzo.c b/lib/decompress_unlzo.c index 4531294fa62f..960183d4258f 100644 --- a/lib/decompress_unlzo.c +++ b/lib/decompress_unlzo.c | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | */ | 31 | */ |
| 32 | 32 | ||
| 33 | #ifdef STATIC | 33 | #ifdef STATIC |
| 34 | #include "lzo/lzo1x_decompress.c" | 34 | #include "lzo/lzo1x_decompress_safe.c" |
| 35 | #else | 35 | #else |
| 36 | #include <linux/decompress/unlzo.h> | 36 | #include <linux/decompress/unlzo.h> |
| 37 | #endif | 37 | #endif |
diff --git a/lib/lzo/Makefile b/lib/lzo/Makefile index e764116ea12d..f0f7d7ca2b83 100644 --- a/lib/lzo/Makefile +++ b/lib/lzo/Makefile | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | lzo_compress-objs := lzo1x_compress.o | 1 | lzo_compress-objs := lzo1x_compress.o |
| 2 | lzo_decompress-objs := lzo1x_decompress.o | 2 | lzo_decompress-objs := lzo1x_decompress_safe.o |
| 3 | 3 | ||
| 4 | obj-$(CONFIG_LZO_COMPRESS) += lzo_compress.o | 4 | obj-$(CONFIG_LZO_COMPRESS) += lzo_compress.o |
| 5 | obj-$(CONFIG_LZO_DECOMPRESS) += lzo_decompress.o | 5 | obj-$(CONFIG_LZO_DECOMPRESS) += lzo_decompress.o |
diff --git a/lib/lzo/lzo1x_decompress.c b/lib/lzo/lzo1x_decompress_safe.c index f2fd09850223..f2fd09850223 100644 --- a/lib/lzo/lzo1x_decompress.c +++ b/lib/lzo/lzo1x_decompress_safe.c | |||