aboutsummaryrefslogtreecommitdiff
path: root/lib/Kconfig
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2015-05-12 14:55:30 +0800
committerAlex Shi <alex.shi@linaro.org>2015-05-12 14:55:30 +0800
commit1f8fdf83fe376cc83e96e942689a6cfac01e9634 (patch)
tree5bd0c30cb23791f2806c85631fe45079e6917b9b /lib/Kconfig
parent8134585f1c33565ea5e752a7ba9323ed3e0921f3 (diff)
parent043787104c5b1386a96c317f2e82ecff257dd9c5 (diff)
downloadlinux-linaro-stable-1f8fdf83fe376cc83e96e942689a6cfac01e9634.tar.gz
Merge remote-tracking branch 'origin/v3.10/topic/zram' into linux-linaro-lsk
Conflicts: mm/Kconfig mm/Makefile
Diffstat (limited to 'lib/Kconfig')
-rw-r--r--lib/Kconfig9
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/Kconfig b/lib/Kconfig
index fe01d418b09a..06d94d885877 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -189,6 +189,15 @@ config LZO_COMPRESS
config LZO_DECOMPRESS
tristate
+config LZ4_COMPRESS
+ tristate
+
+config LZ4HC_COMPRESS
+ tristate
+
+config LZ4_DECOMPRESS
+ tristate
+
source "lib/xz/Kconfig"
#